Skip to content

Commit

Permalink
Replace docker-compose with docker compose (java-native-access#740)
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 77837d7 commit 214a593
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
build-linux-x86_64-maven-cache-
- name: Build docker image
run: docker-compose -f docker/docker-compose.centos-7.yaml -f docker/docker-compose.centos-7.18.yaml build
run: docker compose -f docker/docker-compose.centos-7.yaml -f docker/docker-compose.centos-7.18.yaml build

- name: Build project without leak detection
run: docker-compose -f docker/docker-compose.centos-7.yaml -f docker/docker-compose.centos-7.18.yaml run build | tee build.output
run: docker compose -f docker/docker-compose.centos-7.yaml -f docker/docker-compose.centos-7.18.yaml run build | tee build.output

- name: Checking for test failures
run: ./.github/scripts/check_build_result.sh build.output
Expand Down Expand Up @@ -84,10 +84,10 @@ jobs:
build-linux-aarch64-maven-cache-
- name: Build docker image
run: docker-compose -f docker/docker-compose.centos-7-cross.yaml build
run: docker compose -f docker/docker-compose.centos-7-cross.yaml build

- name: Build project without leak detection
run: docker-compose -f docker/docker-compose.centos-7-cross.yaml run cross-compile-aarch64-build
run: docker compose -f docker/docker-compose.centos-7-cross.yaml run cross-compile-aarch64-build

- uses: actions/upload-artifact@v4
if: ${{ always() }}
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 @@ -67,10 +67,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 @@ -67,10 +67,10 @@ jobs:
${{ runner.os }}-maven-
- 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 test failures
run: ./.github/scripts/check_build_result.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 @@ -135,15 +135,15 @@ jobs:

- name: Build docker image
working-directory: ./prepare-release-workspace/
run: docker-compose ${{ matrix.docker-compose-build }}
run: docker compose ${{ matrix.docker-compose-build }}

- name: Stage release to local staging directory
working-directory: ./prepare-release-workspace/
env:
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-verify-load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
install-jars-linux-aarch64-maven-cache-
- name: Build docker image
run: docker-compose -f docker/docker-compose.centos-7-cross.yaml build
run: docker compose -f docker/docker-compose.centos-7-cross.yaml build

- name: Build project and install jars
run: docker-compose -f docker/docker-compose.centos-7-cross.yaml run cross-compile-aarch64-install
run: docker compose -f docker/docker-compose.centos-7-cross.yaml run cross-compile-aarch64-install

- name: Upload the maven repository
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 214a593

Please sign in to comment.