This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bd94c98f80f54cbdb99c6dc71de127ba3c7c363e Author: yasith <[email protected]> AuthorDate: Sun Mar 16 23:01:25 2025 +0000 move docker-compose file to .devcontainer --- .devcontainer/devcontainer.json | 2 +- .../src/main/containers => .devcontainer}/docker-compose.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 063a1dd9f8..14159f731f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Airavata", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "dockerComposeFile": "../modules/ide-integration/src/main/containers/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "devcontainer", "workspaceFolder": "/workspace", // Features to add to the dev container. More info: https://containers.dev/features. diff --git a/modules/ide-integration/src/main/containers/docker-compose.yml b/.devcontainer/docker-compose.yml similarity index 86% rename from modules/ide-integration/src/main/containers/docker-compose.yml rename to .devcontainer/docker-compose.yml index e8b80cdf6d..db3bdf3b65 100644 --- a/modules/ide-integration/src/main/containers/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -15,7 +15,7 @@ services: devcontainer: image: mcr.microsoft.com/devcontainers/base:debian volumes: - - ./../../../../..:/workspace:cached + - ..:/workspace:cached command: sleep infinity networks: airavata-network: @@ -33,9 +33,9 @@ services: - "18080:8080" - "8443:8443" volumes: - - ./keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json - - ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf - - ../../../../../keystores/airavata.jks:/opt/keycloak/conf/keystores/airavata.jks + - ../modules/ide-integration/src/main/containers/keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json + - ../modules/ide-integration/src/main/containers/keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf + - ../keystores/airavata.jks:/opt/keycloak/conf/keystores/airavata.jks command: ["start-dev", "--import-realm"] depends_on: - db @@ -53,7 +53,7 @@ services: MYSQL_USER: airavata MYSQL_PASSWORD: 123456 volumes: - - ./database_scripts/init:/docker-entrypoint-initdb.d + - ../modules/ide-integration/src/main/containers/database_scripts/init:/docker-entrypoint-initdb.d - db_data:/var/lib/mysql ports: - "13306:3306"
