♻️ Simplify env files, merge to one .env (#151)

scripts/discard-dev-files.sh

@@ -6,9 +6,6 @@ git checkout \{\{cookiecutter.project_slug\}\}/README.md
 git checkout \{\{cookiecutter.project_slug\}\}/.gitlab-ci.yml
 git checkout \{\{cookiecutter.project_slug\}\}/cookiecutter-config-file.yml
 git checkout \{\{cookiecutter.project_slug\}\}/docker-compose.deploy.networks.yml
-git checkout \{\{cookiecutter.project_slug\}\}/env-backend.env
-git checkout \{\{cookiecutter.project_slug\}\}/env-flower.env
 git checkout \{\{cookiecutter.project_slug\}\}/.env
 git checkout \{\{cookiecutter.project_slug\}\}/frontend/.env
-git checkout \{\{cookiecutter.project_slug\}\}/env-pgadmin.env
+
-git checkout \{\{cookiecutter.project_slug\}\}/env-postgres.env

{{cookiecutter.project_slug}}/.env

@@ -13,3 +13,34 @@ TRAEFIK_PUBLIC_TAG={{cookiecutter.traefik_public_constraint_tag}}
 DOCKER_IMAGE_BACKEND={{cookiecutter.docker_image_backend}}
 DOCKER_IMAGE_CELERYWORKER={{cookiecutter.docker_image_celeryworker}}
 DOCKER_IMAGE_FRONTEND={{cookiecutter.docker_image_frontend}}
+
+# Backend
+BACKEND_CORS_ORIGINS={{cookiecutter.backend_cors_origins}}
+PROJECT_NAME={{cookiecutter.project_name}}
+SECRET_KEY={{cookiecutter.secret_key}}
+FIRST_SUPERUSER={{cookiecutter.first_superuser}}
+FIRST_SUPERUSER_PASSWORD={{cookiecutter.first_superuser_password}}
+SMTP_TLS=True
+SMTP_PORT={{cookiecutter.smtp_port}}
+SMTP_HOST={{cookiecutter.smtp_host}}
+SMTP_USER={{cookiecutter.smtp_user}}
+SMTP_PASSWORD={{cookiecutter.smtp_password}}
+EMAILS_FROM_EMAIL={{cookiecutter.smtp_emails_from_email}}
+
+USERS_OPEN_REGISTRATION=False
+
+SENTRY_DSN={{cookiecutter.sentry_dsn}}
+
+# Flower
+FLOWER_BASIC_AUTH={{cookiecutter.flower_auth}}
+
+# Postgres
+POSTGRES_SERVER=db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD={{cookiecutter.postgres_password}}
+POSTGRES_DB=app
+
+# PgAdmin
+PGADMIN_LISTEN_PORT=5050
+PGADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}}
+PGADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}}

{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml

@@ -5,7 +5,7 @@ services:
     depends_on:
       - db
     env_file:
-      - env-pgadmin.env
+      - .env
   proxy:
     image: traefik:v1.7
     volumes:
@@ -13,7 +13,7 @@ services:
   flower:
     image: mher/flower
     env_file:
-      - env-flower.env
+      - .env
     command:
       - "--broker=amqp://guest@queue:5672//"
       # For the "Broker" tab to work in the flower UI, uncomment the following command argument,

{{cookiecutter.project_slug}}/docker-compose.shared.env.yml

@@ -2,20 +2,18 @@ version: '3.3'
 services:
   db:
     env_file:
-      - env-postgres.env
+      - .env
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
   backend:
     env_file:
-      - env-postgres.env
+      - .env
-      - env-backend.env
     environment:
       - SERVER_NAME=${DOMAIN}
       - SERVER_HOST=https://${DOMAIN}
   celeryworker:
     env_file:
-      - env-postgres.env
+      - .env
-      - env-backend.env
     environment:
       - SERVER_NAME=${DOMAIN}
       - SERVER_HOST=https://${DOMAIN}

{{cookiecutter.project_slug}}/docker-compose.test.yml

@@ -6,8 +6,7 @@ services:
       dockerfile: tests.dockerfile
     command: bash -c "while true; do sleep 1; done"
     env_file:
-      - env-backend.env
+      - .env
-      - env-postgres.env
     environment:
       - SERVER_NAME=backend
       - SERVER_HOST=http://${DOMAIN}

{{cookiecutter.project_slug}}/env-backend.env

@@ -1,15 +0,0 @@
-BACKEND_CORS_ORIGINS={{cookiecutter.backend_cors_origins}}
-PROJECT_NAME={{cookiecutter.project_name}}
-SECRET_KEY={{cookiecutter.secret_key}}
-FIRST_SUPERUSER={{cookiecutter.first_superuser}}
-FIRST_SUPERUSER_PASSWORD={{cookiecutter.first_superuser_password}}
-SMTP_TLS=True
-SMTP_PORT={{cookiecutter.smtp_port}}
-SMTP_HOST={{cookiecutter.smtp_host}}
-SMTP_USER={{cookiecutter.smtp_user}}
-SMTP_PASSWORD={{cookiecutter.smtp_password}}
-EMAILS_FROM_EMAIL={{cookiecutter.smtp_emails_from_email}}
-
-USERS_OPEN_REGISTRATION=False
-
-SENTRY_DSN={{cookiecutter.sentry_dsn}}

{{cookiecutter.project_slug}}/env-flower.env

@@ -1 +0,0 @@
-FLOWER_BASIC_AUTH={{cookiecutter.flower_auth}}

{{cookiecutter.project_slug}}/env-pgadmin.env

@@ -1,3 +0,0 @@
-PGADMIN_LISTEN_PORT=5050
-PGADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}}
-PGADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}}

{{cookiecutter.project_slug}}/env-postgres.env

@@ -1,4 +0,0 @@
-POSTGRES_SERVER=db
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD={{cookiecutter.postgres_password}}
-POSTGRES_DB=app