Fix docker compose command

RADAR-base · Sep 9, 2024 · 46f2d88 · 46f2d88
1 parent 3838c55
commit 46f2d88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -209,9 +209,9 @@ jobs:
 #        run: |
 #          cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 #          ./gradlew -Pprod buildDocker -x test -x javadocJar
-#          docker-compose -f src/main/docker/app.yml up -d
+#          docker compose -f src/main/docker/app.yml up -d
 #          yarn run e2e-prod
-#          docker-compose -f src/main/docker/app.yml down -v
+#          docker compose -f src/main/docker/app.yml down -v
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -63,10 +63,10 @@ jobs:
         id: e2e
         run: |
           cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
-          docker-compose -f src/main/docker/postgresql.yml up -d
+          docker compose -f src/main/docker/postgresql.yml up -d
           ./gradlew bootRun -Pprod -Pe2e-prod-test &>mp.log </dev/null &
           yarn run e2e-prod
-          docker-compose -f src/main/docker/postgresql.yml down -v
+          docker compose -f src/main/docker/postgresql.yml down -v
           ./gradlew --stop
 
       - name: Upload screenshots of failed e2e tests

diff --git a/src/test/bash/run-prod-e2e.sh b/src/test/bash/run-prod-e2e.sh
@@ -9,7 +9,7 @@ cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 cp src/test/resources/config/keystore.p12 src/main/resources/config
 
 ./gradlew bootrun -Pe2e-prod-test -x test -x javadocJar &
-docker-compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
+docker compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
 set +e
 
 if ./gradlew generateOpenApiSpec && yarn run e2e-prod; then
@@ -18,5 +18,5 @@ else
   EXIT_STATUS=1
 fi
 
-docker-compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
+docker compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
 exit $EXIT_STATUS