update command for latest docker versions

Ortus-Solutions · Apr 3, 2024 · 2d3a949 · 2d3a949
1 parent 20b7d15
commit 2d3a949
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -85,5 +85,5 @@ jobs:
           COMPOSE_DOCKER_CLI_BUILD: 1
           BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
         run: |
-          docker-compose -f docker-compose.test.yml up --build --exit-code-from sut
-          docker-compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
+          docker compose -f docker-compose.test.yml up --build --exit-code-from sut
+          docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -143,8 +143,8 @@ jobs:
           COMPOSE_DOCKER_CLI_BUILD: 1
           BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
         run: |
-          docker-compose -f docker-compose.test.yml up --build --exit-code-from sut
-          docker-compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
+          docker compose -f docker-compose.test.yml up --build --exit-code-from sut
+          docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
 
       - name: Build Final
         uses: docker/build-push-action@v4

diff --git a/docker-compose.secret-test.yml b/docker-compose.secret-test.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 # This tests the CommandBox Docker Secrets implementation
 # To test:
-# BUILD_IMAGE_DOCKERFILE=Dockerfile BUILD_IMAGE_TAG=ortussolutions/commandbox docker-compose -f docker-compose.secret-test.yml up --build
+# BUILD_IMAGE_DOCKERFILE=Dockerfile BUILD_IMAGE_TAG=ortussolutions/commandbox docker compose -f docker-compose.secret-test.yml up --build
 
 services:
 

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 # This tests the CommandBox Docker Secrets implementation
 # To test:
-# BUILD_IMAGE_DOCKERFILE=Dockerfile BUILD_IMAGE_TAG=ortussolutions/commandbox docker-compose -f docker-compose.secret-test.yml up --build
+# BUILD_IMAGE_DOCKERFILE=Dockerfile BUILD_IMAGE_TAG=ortussolutions/commandbox docker compose -f docker-compose.secret-test.yml up --build
 
 services:
   sut: