From 2d3a9499dfdb5bc34afb71e5b38294da17fd5f2f Mon Sep 17 00:00:00 2001 From: jclausen Date: Wed, 3 Apr 2024 13:28:11 -0400 Subject: [PATCH] update command for latest docker versions --- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- docker-compose.secret-test.yml | 2 +- docker-compose.test.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b27a156..796e9e9 100644 --- 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 index e655e6a..dce85df 100644 --- 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 index e29180c..33f1013 100644 --- 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 index 347094f..0bdc7e1 100644 --- 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: