Skip to content

Commit

Permalink
Replace docker-compose with docker compose (#877)
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 a57a988 commit c9231f2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
build-${{ matrix.setup }}-m2-repository-cache-
- name: Build docker image
run: docker-compose ${{ matrix.docker-compose-build }}
run: docker compose ${{ matrix.docker-compose-build }}

- name: Build project
run: docker-compose ${{ matrix.docker-compose-run }} | tee build.output
run: docker compose ${{ matrix.docker-compose-run }} | tee build.output

- name: Checking for test failures
run: ./.github/scripts/check_build_result.sh build.output
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 @@ -50,10 +50,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 @@ -44,10 +44,10 @@ jobs:
build-pr-${{ matrix.setup }}-m2-repository-cache-
- name: Build docker image
run: docker-compose ${{ matrix.docker-compose-build }}
run: docker compose ${{ matrix.docker-compose-build }}

- name: Build project
run: docker-compose ${{ matrix.docker-compose-run }} | tee build.output
run: docker compose ${{ matrix.docker-compose-run }} | tee build.output

- name: Checking for test failures
run: ./.github/scripts/check_build_result.sh build.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 @@ -131,15 +131,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
10 changes: 5 additions & 5 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@ cd /path/to/netty-tcnative/
## Arch Linux with java 8

```
docker-compose -f docker/docker-compose.arch.yaml -f docker/docker-compose.arch-18.yaml run build
docker compose -f docker/docker-compose.arch.yaml -f docker/docker-compose.arch-18.yaml run build
```

## 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
```

## debian 7 with java 8

```
docker-compose -f docker/docker-compose.debian.yaml -f docker/docker-compose.debian-7.18.yaml run build
docker compose -f docker/docker-compose.debian.yaml -f docker/docker-compose.debian-7.18.yaml run build
```

## openSUSE Leap 15.1 with java 8

```
docker-compose -f docker/docker-compose.opensuse.yaml -f docker/docker-compose.opensuse-151.18.yaml run build
docker compose -f docker/docker-compose.opensuse.yaml -f docker/docker-compose.opensuse-151.18.yaml run build
```

## centos7 with java8 for aarch64 cross compile

```
docker-compose -f docker/docker-compose.centos-7.yaml run cross-compile-aarch64-build
docker compose -f docker/docker-compose.centos-7.yaml run cross-compile-aarch64-build
```

etc, etc
Expand Down

0 comments on commit c9231f2

Please sign in to comment.