Use docker compose instead of docker-compose to fix GH workflows

cBioPortal · Dec 19, 2024 · e4eeea1 · e4eeea1
1 parent 1943540
commit e4eeea1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -54,7 +54,7 @@ jobs:
       - name: 'Start cbioportal-docker-compose'
         working-directory: ./cbioportal-docker-compose
         run: |
-          docker-compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml up -d
+          docker compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml up -d
       - name: 'Wait for cbioportal to initialize ...'
         id: startup
         uses: nev7n/wait_for_response@v1

diff --git a/test/integration/test_import_export.sh b/test/integration/test_import_export.sh
@@ -6,7 +6,7 @@ set -e
 run_in_service() {
     service=$1
     shift
-    docker-compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
+    docker compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
         run --rm \
         "$service" bash -c "$@"
     return $?  # return the exit code of the last command

diff --git a/test/integration/test_integration_test_oncokb_import.sh b/test/integration/test_integration_test_oncokb_import.sh
@@ -6,7 +6,7 @@ set -e
 run_in_service() {
     service=$1
     shift
-    docker-compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
+    docker compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
         run --rm \
         "$service" bash -c "$@"
 }

diff --git a/test/integration/test_load_study.sh b/test/integration/test_load_study.sh
@@ -6,7 +6,7 @@ set -e
 run_in_service() {
     service=$1
     shift
-    docker-compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
+    docker compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
         run --rm \
         "$service" bash -c "$@"
 }

diff --git a/test/integration/test_update_oncokb.sh b/test/integration/test_update_oncokb.sh
@@ -5,7 +5,7 @@ set -e
 run_in_service() {
     service=$1
     shift
-    docker-compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
+    docker compose -f docker-compose.yml -f $PORTAL_SOURCE_DIR/test/integration/docker-compose-localbuild.yml \
         run --rm \
         "$service" bash -c "$@"
 }