Skip to content

Commit

Permalink
Replace docker-compose with docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
notoraptor committed Apr 3, 2024
1 parent 5d29008 commit ec1c4b4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions produce_fake_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ec1c4b4

Please sign in to comment.