Skip to content

Commit

Permalink
Replace docker-compose with docker compose (#253)
Browse files Browse the repository at this point in the history
Motivation:

docker-compose is no more and you should use docker compose

Modifications:

Replace docker-compose with docker compose

Result:

Build works again
  • Loading branch information
normanmaurer authored Aug 5, 2024
1 parent 28fff98 commit b05fe91
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

0 comments on commit b05fe91

Please sign in to comment.