From ec1c4b4f819a4e7ce6d252945dc52529313d721a Mon Sep 17 00:00:00 2001 From: notoraptor Date: Wed, 3 Apr 2024 10:42:55 -0400 Subject: [PATCH] Replace `docker-compose` with `docker compose` --- .github/workflows/ci_frontend.yml | 2 +- dev.sh | 4 ++-- produce_fake_data.sh | 4 ++-- test.sh | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_frontend.yml b/.github/workflows/ci_frontend.yml index 92bfd047..554aaea9 100644 --- a/.github/workflows/ci_frontend.yml +++ b/.github/workflows/ci_frontend.yml @@ -17,4 +17,4 @@ jobs: - name: Launch frontend tests run: | . ./env.sh - docker-compose run clockwork_dev scripts/launch_frontend_tests_in_clockwork_dev.sh + docker compose run clockwork_dev scripts/launch_frontend_tests_in_clockwork_dev.sh diff --git a/dev.sh b/dev.sh index 4e6331f4..fd105fc8 100644 --- a/dev.sh +++ b/dev.sh @@ -7,6 +7,6 @@ docker build -t clockwork_dev -f clockwork_dev.Dockerfile . . ./env.sh # Make sure to cleanup on exit -trap "docker-compose down && docker-compose rm -fv" EXIT +trap "docker compose down && docker compose rm -fv" EXIT -docker-compose run --service-ports clockwork_dev +docker compose run --service-ports clockwork_dev diff --git a/produce_fake_data.sh b/produce_fake_data.sh index 25127f09..fb2e1317 100644 --- a/produce_fake_data.sh +++ b/produce_fake_data.sh @@ -5,7 +5,7 @@ set -eu . ./env.sh # This is to ensure that there aren't lingering containers after the test script exits. -trap "docker-compose down && docker-compose rm -fv" EXIT +trap "docker compose down && docker compose rm -fv" EXIT # Run the Docker containers -docker-compose run clockwork_scripts +docker compose run clockwork_scripts diff --git a/test.sh b/test.sh index 166a2d06..bc76c19e 100644 --- a/test.sh +++ b/test.sh @@ -10,9 +10,9 @@ docker build -t scripts_test -f scripts_test/Dockerfile . . ./env.sh # This is to ensure that there aren't lingering containers after the test script exits. -trap "docker-compose down && docker-compose rm -fv" EXIT +trap "docker compose down && docker compose rm -fv" EXIT -docker-compose run clockwork_web_test -docker-compose run clockwork_tools_test -docker-compose run slurm_state_test -docker-compose run scripts_test +docker compose run clockwork_web_test +docker compose run clockwork_tools_test +docker compose run slurm_state_test +docker compose run scripts_test