Skip to content

Commit

Permalink
Do simple replace of "docker-compose" instances
Browse files Browse the repository at this point in the history
  • Loading branch information
amoeba committed Aug 6, 2024
1 parent e6b05a8 commit c69c1d8
Show file tree
Hide file tree
Showing 19 changed files with 225 additions and 225 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-06-18

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
# https://hub.docker.com/u/conanio for available images.
CONAN_BASE=gcc10
Expand Down
8 changes: 4 additions & 4 deletions cpp/examples/minimal_build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ minimal Ubuntu image with a basic C++ toolchain.
Just open a terminal in this directory and run the following commands:

```bash
docker-compose run --rm minimal
docker compose run --rm minimal
```

Note that this example mounts two volumes inside the Docker image:
Expand All @@ -52,7 +52,7 @@ create a statically-linked executable with bundled dependencies.
To run it on Linux, you can use the above Docker image:

```bash
docker-compose run --rm static
docker compose run --rm static
```

On macOS, you can use the `run_static.sh` but you must set some environment
Expand All @@ -79,10 +79,10 @@ call run_static.bat
You can also use static libraries of Arrow's dependencies from the
system. To run this configuration, set
`ARROW_DEPENDENCY_SOURCE=SYSTEM` for `run_static.sh`. You can use
`docker-compose` for this too:
`docker compose` for this too:

```bash
docker-compose run --rm static-system-dependency
docker compose run --rm static-system-dependency
```

[docker-compose]: https://docs.docker.com/compose/
18 changes: 9 additions & 9 deletions dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ docker build -t arrow_integration_xenial_base -f docker_common/Dockerfile.xenial
## HDFS C++ / Python support

```shell
docker-compose build conda-cpp
docker-compose build conda-python
docker-compose build conda-python-hdfs
docker-compose run --rm conda-python-hdfs
docker compose build conda-cpp
docker compose build conda-python
docker compose build conda-python-hdfs
docker compose run --rm conda-python-hdfs
```

## Apache Spark Integration Tests
Expand All @@ -150,10 +150,10 @@ related unit tests in Spark for Java and Python. Any errors will exit with a
non-zero value. To run, use the following command:

```shell
docker-compose build conda-cpp
docker-compose build conda-python
docker-compose build conda-python-spark
docker-compose run --rm conda-python-spark
docker compose build conda-cpp
docker compose build conda-python
docker compose build conda-python-spark
docker compose run --rm conda-python-spark
```

If you already are building Spark, these commands will map your local Maven
Expand All @@ -162,7 +162,7 @@ Be aware, that docker write files as root, which can cause problems for maven
on the host.

```shell
docker-compose run --rm -v $HOME/.m2:/root/.m2 conda-python-spark
docker compose run --rm -v $HOME/.m2:/root/.m2 conda-python-spark
```

NOTE: If the Java API has breaking changes, a patched version of Spark might
Expand Down
2 changes: 1 addition & 1 deletion dev/archery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ to use the functionality of it:
To install: `pip install -e "arrow/dev/archery[lint]"`
* benchmark – to run Arrow benchmarks using Archery
To install: `pip install -e "arrow/dev/archery[benchmark]"`
* docker – to run docker-compose based tasks more easily
* docker – to run docker compose based tasks more easily
To install: `pip install -e "arrow/dev/archery[docker]"`
* release – release related helpers
To install: `pip install -e "arrow/dev/archery[release]"`
Expand Down
8 changes: 4 additions & 4 deletions dev/archery/archery/crossbow/tests/fixtures/azure-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- script: |
set -ex
docker -v
docker-compose -v
docker compose -v
cd arrow
docker-compose pull --ignore-pull-failures r
docker-compose build r
displayName: Docker build
docker compose pull --ignore-pull-failures r
docker compose build r
displayName: Docker build
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ tasks:
artifacts: []
params:
commands:
- docker-compose build cpp-cmake32
- docker-compose run cpp-cmake32
- docker compose build cpp-cmake32
- docker compose run cpp-cmake32
branch: ursabot-1-circle-docker-cpp-cmake32
commit: a56b077c8d1b891a7935048e5672bf6fc07599ec
_status: !TaskStatus
Expand Down
4 changes: 2 additions & 2 deletions dev/archery/archery/crossbow/tests/fixtures/crossbow-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ tasks:
artifacts: []
params:
commands:
- docker-compose build cpp-cmake32
- docker-compose run cpp-cmake32
- docker compose build cpp-cmake32
- docker compose run cpp-cmake32
branch: ursabot-1-circle-docker-cpp-cmake32
commit: a56b077c8d1b891a7935048e5672bf6fc07599ec
_status: !TaskStatus
Expand Down
4 changes: 2 additions & 2 deletions dev/archery/archery/crossbow/tests/test_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def test_crossbow_export_report(load_fixture):
'https://github.com/apache/crossbow/tree/'
'ursabot-1-circle-docker-cpp-cmake32',
'circle',
{'commands': ['docker-compose build cpp-cmake32',
'docker-compose run cpp-cmake32']},
{'commands': ['docker compose build cpp-cmake32',
'docker compose run cpp-cmake32']},
'docker-tests/circle.linux.yml',
'f766a1d615dd1b7ee706d05102e579195951a61c'
]
Expand Down
4 changes: 2 additions & 2 deletions dev/archery/archery/docker/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ def _read_config(self, config_path, compose_bin):
'`x-hierarchy`'.format(name)
)

# trigger docker-compose's own validation
# trigger docker compose's own validation
if self.using_docker:
compose = Docker()
args = ['compose']
else:
compose = Command('docker-compose')
compose = Command('docker compose')
args = []
args += ['--file', str(config_path), 'config']
result = compose.run(*args, env=self.env, check=False,
Expand Down
Loading

0 comments on commit c69c1d8

Please sign in to comment.