Skip to content

Commit

Permalink
MINOR: [CI] Replace docker-compose with docker compose (apache#43566)
Browse files Browse the repository at this point in the history
"docker-compose" is not available on some CI images anymore, switch to the Docker built-in "compose" command.

Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
pitrou authored Aug 5, 2024
1 parent 66cb749 commit 5710638
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ jobs:
- name: Run minimal example
run: |
cd cpp/examples/minimal_build
docker-compose run --rm minimal
docker compose run --rm minimal
macos:
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} C++
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/cpp-examples/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
shell: bash
run: |
cd arrow/cpp/examples/{{ type }}
docker-compose run --rm {{ run }}
docker compose run --rm {{ run }}
2 changes: 1 addition & 1 deletion dev/tasks/python-minimal-build/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
- name: Run minimal build example
run: |
cd arrow/python/examples/{{ type }}
docker-compose run --rm {{ image }}
docker compose run --rm {{ image }}
8 changes: 4 additions & 4 deletions dev/tasks/r/azure.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
- script: |
set -ex
docker -v
docker-compose -v
docker compose version
cd arrow
export R_ORG={{ r_org }}
export R_IMAGE={{ r_image }}
export R_TAG={{ r_tag }}
export R_CUSTOM_CCACHE={{ r_custom_ccache|default("false") }}
docker-compose pull --ignore-pull-failures r
docker-compose build r
docker compose pull --ignore-pull-failures r
docker compose build r
displayName: Docker build
env:
{{ macros.azure_set_sccache_envvars()|indent(4) }}
Expand All @@ -54,7 +54,7 @@ jobs:
export ARROW_R_DEV={{ not_cran|default("TRUE") }}
# Note that by default, ci/scripts/r_test.sh sets NOT_CRAN=true
# if ARROW_R_DEV=TRUE. Pass `-e NOT_CRAN=false` to turn that off.
docker-compose run {{ flags|default("") }} r
docker compose run {{ flags|default("") }} r
displayName: Docker run
env:
{{ macros.azure_set_sccache_envvars()|indent(4) }}
Expand Down

0 comments on commit 5710638

Please sign in to comment.