Skip to content

Commit

Permalink
fix: switch to docker compose plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
alee committed Dec 6, 2024
1 parent b68a9e5 commit 464d09d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions compose
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 464d09d

Please sign in to comment.