♻️ Simplify Docker Compose files and deployment (#153)

* ♻️ Simplify Docker Compose files and deployment

* 🔧 Remove TRAEFIK_PUBLIC_NETWORK_IS_EXTERNAL from .env

{{cookiecutter.project_slug}}/scripts/build-push.sh

@@ -7,4 +7,4 @@ TAG=${TAG} \
 FRONTEND_ENV=${FRONTEND_ENV-production} \
 . ./scripts/build.sh
 
-docker-compose -f docker-stack.yml push
+docker-compose -f docker-compose.yml push

{{cookiecutter.project_slug}}/scripts/build.sh

@@ -6,8 +6,5 @@ set -e
 TAG=${TAG} \
 FRONTEND_ENV=${FRONTEND_ENV-production} \
 docker-compose \
--f docker-compose.deploy.build.yml \
--f docker-compose.deploy.images.yml \
-config > docker-stack.yml
-
-docker-compose -f docker-stack.yml build
+-f docker-compose.yml \
+build

{{cookiecutter.project_slug}}/scripts/deploy.sh

@@ -8,17 +8,9 @@ TRAEFIK_TAG=${TRAEFIK_TAG} \
 STACK_NAME=${STACK_NAME} \
 TAG=${TAG} \
 docker-compose \
--f docker-compose.shared.admin.yml \
--f docker-compose.shared.base-images.yml \
--f docker-compose.shared.depends.yml \
--f docker-compose.shared.env.yml \
--f docker-compose.deploy.command.yml \
--f docker-compose.deploy.images.yml \
--f docker-compose.deploy.labels.yml \
--f docker-compose.deploy.networks.yml \
--f docker-compose.deploy.volumes-placement.yml \
+-f docker-compose.yml \
 config > docker-stack.yml
 
 docker-auto-labels docker-stack.yml
 
-docker stack deploy -c docker-stack.yml --with-registry-auth ${STACK_NAME}
+docker stack deploy -c docker-stack.yml --with-registry-auth "${STACK_NAME}"

{{cookiecutter.project_slug}}/scripts/test-local.sh

@@ -3,27 +3,13 @@
 # Exit in case of error
 set -e
 
+docker-compose down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error
+
 if [ $(uname -s) = "Linux" ]; then
     echo "Remove __pycache__ files"
     sudo find . -type d -name __pycache__ -exec rm -r {} \+
 fi
 
-docker-compose \
-    -f docker-compose.shared.admin.yml \
-    -f docker-compose.shared.base-images.yml \
-    -f docker-compose.shared.depends.yml \
-    -f docker-compose.shared.env.yml \
-    -f docker-compose.dev.build.yml \
-    -f docker-compose.dev.env.yml \
-    -f docker-compose.dev.labels.yml \
-    -f docker-compose.dev.networks.yml \
-    -f docker-compose.dev.ports.yml \
-    -f docker-compose.dev.volumes.yml \
-    config > docker-stack.yml
-
-#    -f docker-compose.dev.command.yml \
-
-docker-compose -f docker-stack.yml build
-docker-compose -f docker-stack.yml down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error
-docker-compose -f docker-stack.yml up -d
-docker-compose -f docker-stack.yml exec -T backend-tests /tests-start.sh "$@"
+docker-compose build
+docker-compose up -d
+docker-compose exec -T backend bash /app/tests-start.sh "$@"

{{cookiecutter.project_slug}}/scripts/test.sh

@@ -3,12 +3,11 @@
 # Exit in case of error
 set -e
 
-DOMAIN=backend SMTP_HOST="" \
+DOMAIN=backend \
+SMTP_HOST="" \
+TRAEFIK_PUBLIC_NETWORK_IS_EXTERNAL=false \
 docker-compose \
--f docker-compose.shared.base-images.yml \
--f docker-compose.shared.env.yml \
--f docker-compose.shared.depends.yml \
--f docker-compose.deploy.build.yml \
+-f docker-compose.yml \
 config > docker-stack.yml
 
 docker-compose -f docker-stack.yml build