From a7d3671a7210608e56f4d4ccb5c7496a24339171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Sun, 19 Apr 2020 09:17:14 +0200 Subject: [PATCH] :recycle: Simplify env files, merge to one .env (#151) --- scripts/discard-dev-files.sh | 5 +-- {{cookiecutter.project_slug}}/.env | 31 +++++++++++++++++++ .../docker-compose.shared.admin.yml | 4 +-- .../docker-compose.shared.env.yml | 8 ++--- .../docker-compose.test.yml | 3 +- {{cookiecutter.project_slug}}/env-backend.env | 15 --------- {{cookiecutter.project_slug}}/env-flower.env | 1 - {{cookiecutter.project_slug}}/env-pgadmin.env | 3 -- .../env-postgres.env | 4 --- 9 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 {{cookiecutter.project_slug}}/env-backend.env delete mode 100644 {{cookiecutter.project_slug}}/env-flower.env delete mode 100644 {{cookiecutter.project_slug}}/env-pgadmin.env delete mode 100644 {{cookiecutter.project_slug}}/env-postgres.env diff --git a/scripts/discard-dev-files.sh b/scripts/discard-dev-files.sh index 21d444e..47fc5d2 100644 --- a/scripts/discard-dev-files.sh +++ b/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 + diff --git a/{{cookiecutter.project_slug}}/.env b/{{cookiecutter.project_slug}}/.env index 6f0bf56..231d2ad 100644 --- a/{{cookiecutter.project_slug}}/.env +++ b/{{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}} diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml index 57d6d8e..72b9de3 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml +++ b/{{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, diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.env.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.env.yml index 41d6de9..e7d6e1c 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.shared.env.yml +++ b/{{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-backend.env + - .env environment: - SERVER_NAME=${DOMAIN} - SERVER_HOST=https://${DOMAIN} celeryworker: env_file: - - env-postgres.env - - env-backend.env + - .env environment: - SERVER_NAME=${DOMAIN} - SERVER_HOST=https://${DOMAIN} diff --git a/{{cookiecutter.project_slug}}/docker-compose.test.yml b/{{cookiecutter.project_slug}}/docker-compose.test.yml index a8ea542..df874e5 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.test.yml +++ b/{{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-postgres.env + - .env environment: - SERVER_NAME=backend - SERVER_HOST=http://${DOMAIN} diff --git a/{{cookiecutter.project_slug}}/env-backend.env b/{{cookiecutter.project_slug}}/env-backend.env deleted file mode 100644 index 1cf2174..0000000 --- a/{{cookiecutter.project_slug}}/env-backend.env +++ /dev/null @@ -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}} diff --git a/{{cookiecutter.project_slug}}/env-flower.env b/{{cookiecutter.project_slug}}/env-flower.env deleted file mode 100644 index 438f924..0000000 --- a/{{cookiecutter.project_slug}}/env-flower.env +++ /dev/null @@ -1 +0,0 @@ -FLOWER_BASIC_AUTH={{cookiecutter.flower_auth}} diff --git a/{{cookiecutter.project_slug}}/env-pgadmin.env b/{{cookiecutter.project_slug}}/env-pgadmin.env deleted file mode 100644 index 296cbe8..0000000 --- a/{{cookiecutter.project_slug}}/env-pgadmin.env +++ /dev/null @@ -1,3 +0,0 @@ -PGADMIN_LISTEN_PORT=5050 -PGADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}} -PGADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}} diff --git a/{{cookiecutter.project_slug}}/env-postgres.env b/{{cookiecutter.project_slug}}/env-postgres.env deleted file mode 100644 index 6971973..0000000 --- a/{{cookiecutter.project_slug}}/env-postgres.env +++ /dev/null @@ -1,4 +0,0 @@ -POSTGRES_SERVER=db -POSTGRES_USER=postgres -POSTGRES_PASSWORD={{cookiecutter.postgres_password}} -POSTGRES_DB=app