From b05fe9112c560e8bf409b121b155b46439ae52df Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 5 Aug 2024 06:48:45 -1000 Subject: [PATCH] Replace docker-compose with docker compose (#253) Motivation: docker-compose is no more and you should use docker compose Modifications: Replace docker-compose with docker compose Result: Build works again --- .github/workflows/ci-build.yml | 4 ++-- .github/workflows/ci-deploy.yml | 4 ++-- .github/workflows/ci-pr.yml | 4 ++-- .github/workflows/ci-release.yml | 4 ++-- docker/README.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 602e675c..3cdc36a1 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -55,10 +55,10 @@ jobs: build-${{ matrix.setup }}-cache-m2-repository- - name: Build docker image - run: docker-compose ${{ matrix.docker-compose-build }} + run: docker compose ${{ matrix.docker-compose-build }} - name: Build project without leak detection - run: docker-compose ${{ matrix.docker-compose-run }} + run: docker compose ${{ matrix.docker-compose-run }} - uses: actions/upload-artifact@v3 if: ${{ failure() }} diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index 0cea95b4..43a46399 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -57,10 +57,10 @@ jobs: run: mkdir -p ~/local-staging - name: Build docker image - run: docker-compose ${{ matrix.docker-compose-build }} + run: docker compose ${{ matrix.docker-compose-build }} - name: Stage snapshots to local staging directory - run: docker-compose ${{ matrix.docker-compose-run }} + run: docker compose ${{ matrix.docker-compose-run }} - name: Upload local staging directory uses: actions/upload-artifact@v4 diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index ad27fffa..6892d519 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -78,10 +78,10 @@ jobs: build-pr-${{ matrix.setup }}-cache-m2-repository- - name: Build docker image - run: docker-compose ${{ matrix.docker-compose-build }} + run: docker compose ${{ matrix.docker-compose-build }} - name: Build project with leak detection - run: docker-compose ${{ matrix.docker-compose-run }} | tee build-leak.output + run: docker compose ${{ matrix.docker-compose-run }} | tee build-leak.output - name: Checking for detected leak run: ./.github/scripts/check_leak.sh build-leak.output diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 80449626..bebb5ca3 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -118,7 +118,7 @@ jobs: - name: Build docker image working-directory: ./prepare-release-workspace/ - run: docker-compose ${{ matrix.docker-compose-build }} + run: docker compose ${{ matrix.docker-compose-build }} - uses: s4u/maven-settings-action@v3.0.0 with: @@ -135,7 +135,7 @@ jobs: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: docker-compose ${{ matrix.docker-compose-run }} + run: docker compose ${{ matrix.docker-compose-run }} - name: Upload local staging directory uses: actions/upload-artifact@v4 diff --git a/docker/README.md b/docker/README.md index 9d0ed016..3ff0b61b 100755 --- a/docker/README.md +++ b/docker/README.md @@ -7,5 +7,5 @@ cd /path/to/source/ ## centos 6 with java 8 ``` -docker-compose -f docker/docker-compose.centos-6.yaml -f docker/docker-compose.centos-6.18.yaml run build +docker compose -f docker/docker-compose.centos-6.yaml -f docker/docker-compose.centos-6.18.yaml run build ```