Skip to content

Commit

Permalink
ci: switch from docker-compose.yml to compose.yaml (#2458)
Browse files Browse the repository at this point in the history
Closes #2457.
  • Loading branch information
mbrobbel authored Jan 20, 2025
1 parent d9dad70 commit a889b08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

# All of the following environment variables are required to set default values
# for the parameters in docker-compose.yml.
# for the parameters in compose.yaml.

# Default repository to pull and push images from
REPO=apache/arrow-dev
Expand All @@ -37,14 +37,14 @@ GO=1.22.9
ARROW_MAJOR_VERSION=14
DOTNET=8.0

# Used through docker-compose.yml and serves as the default version for the
# Used through compose.yaml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Keep in sync with apache/arrow .env.
# When updating, also update the docs, which list the version of libpq/SQLite
# that vcpkg (and hence our wheels) ship
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01"

# These are used to tell tests where to find services for integration testing.
# They are valid if the services are started with the docker-compose config.
# They are valid if the services are started with the compose config.
ADBC_DREMIO_FLIGHTSQL_PASS=dremio123
ADBC_DREMIO_FLIGHTSQL_URI=grpc+tcp://localhost:32010
ADBC_DREMIO_FLIGHTSQL_USER=dremio
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml → compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:

############################ Python conda ##################################

# Must be run as docker-compose run -e HOST_USER_ID=$(id -u) python-conda
# Must be run as docker compose run -e HOST_USER_ID=$(id -u) python-conda
python-conda:
image: condaforge/linux-anvil-cos7-x86_64
volumes:
Expand Down

0 comments on commit a889b08

Please sign in to comment.