Skip to content

Commit

Permalink
replace "docker-compose" with "docker compose"
Browse files Browse the repository at this point in the history
All cli flag usage appears to be exactly the same. Docker says as much
in their migration docs: https://docs.docker.com/compose/migrate/#command-line-flags-and-subcommands

Signed-off-by: Taylor Silva <dev@taydev.net>
  • Loading branch information
taylorsilva committed Apr 21, 2024
1 parent 7c2095a commit 633f373
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Configuration files for BOSH- and terraform-managed deployments used in testing.
A lot of Dockerfiles are used throughout the Concourse automation. Many of those are in the `/dockerfiles` folder.

## Overrides
Overrides for `docker-compose`.
Overrides for `docker compose`.

## Pipelines
Pipeline definitions live here. Some highlights:
Expand Down
4 changes: 2 additions & 2 deletions tasks/scripts/quickstart-smoke
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ start_docker
# load in concourse/concourse-dev:latest
[ -d concourse-rc-image ] && docker load -i concourse-rc-image/image.tar

docker-compose -f docs/docker-compose.yml -f ci/overrides/docker-compose.latest-rc.yml up -d
docker compose -f docs/docker-compose.yml -f ci/overrides/docker-compose.latest-rc.yml up -d

# now run the watjs/smoke tests
mkdir -p endpoint-info
Expand All @@ -22,7 +22,7 @@ popd
ci/tasks/scripts/smoke

pushd docs
docker-compose down
docker compose down
popd

stop_docker
2 changes: 1 addition & 1 deletion tasks/scripts/testflight
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo

ginkgo -r -nodes=4 --race --keep-going --poll-progress-after=15s --flake-attempts=3 ./testflight "$@"

docker-compose logs > ../docker-compose.log
docker compose logs > ../docker-compose.log
6 changes: 3 additions & 3 deletions tasks/scripts/with-docker-compose
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ DOCKER_COMPOSE_FLAGS="-f concourse/docker-compose.yml -f ci/overrides/docker-com

ci/tasks/scripts/generate-keys

docker-compose \
docker compose \
$DOCKER_COMPOSE_FLAGS \
-f ci/overrides/docker-compose.no-build.yml \
up --no-build -d

trap stop_docker_compose EXIT SIGTERM SIGINT
function stop_docker_compose() {
docker-compose -f concourse/docker-compose.yml logs > docker-compose.log
docker-compose -f concourse/docker-compose.yml down
docker compose -f concourse/docker-compose.yml logs > docker-compose.log
docker compose -f concourse/docker-compose.yml down
stop_docker
}

Expand Down

0 comments on commit 633f373

Please sign in to comment.