diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index acc2378..054a442 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -28,4 +28,4 @@ jobs: ./build.sh - name: Run Django tests run: | - docker-compose run --rm django /code/deploy/docker/test.sh + docker compose run --rm django /code/deploy/docker/test.sh diff --git a/compose b/compose index ce522ce..5030eee 100755 --- a/compose +++ b/compose @@ -1,11 +1,11 @@ #!/usr/bin/env bash -# Convenience script for creating local docker-compose +# Convenience script for creating local docker-compose.yml DOCKER_COMPOSE_ENV=${1:-dev} if [[ "$DOCKER_COMPOSE_ENV" == "prod" ]]; then - docker-compose -f base.yml -f staging.yml -f ${DOCKER_COMPOSE_ENV}.yml config > docker-compose.yml + docker compose -f base.yml -f staging.yml -f ${DOCKER_COMPOSE_ENV}.yml config > docker-compose.yml elif [[ "$DOCKER_COMPOSE_ENV" == "staging" ]]; then - docker-compose -f base.yml -f staging.yml config > docker-compose.yml + docker compose -f base.yml -f staging.yml config > docker-compose.yml else - docker-compose -f base.yml -f dev.yml config > docker-compose.yml + docker compose -f base.yml -f dev.yml config > docker-compose.yml fi