From 0e3a9775f0f23855f6e3e8eaa6547a73e2e54c22 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 20 Mar 2017 16:57:17 +0300 Subject: [PATCH 1/4] Reference dev.yml's 'orphan' environment variables from dev.env This is to elaborate on the proposal made in #1082. Contain 'orphan' variables scattered all around dev.yml in a separate dev.env file which can be stored in VCS likewise the development-specific variables it defines are. N.B. `django` service's `USE_DOCKER=yes` variable left intact for its use to be isolated within the service only. --- {{cookiecutter.project_slug}}/dev.env | 4 ++++ {{cookiecutter.project_slug}}/dev.yml | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/dev.env diff --git a/{{cookiecutter.project_slug}}/dev.env b/{{cookiecutter.project_slug}}/dev.env new file mode 100644 index 000000000..cce84cfe1 --- /dev/null +++ b/{{cookiecutter.project_slug}}/dev.env @@ -0,0 +1,4 @@ +POSTGRES_USER={{cookiecutter.project_slug}} +POSTGRES_PASSWORD={{cookiecutter.project_slug}} +POSTGRES_DB={{cookiecutter.project_slug}} + diff --git a/{{cookiecutter.project_slug}}/dev.yml b/{{cookiecutter.project_slug}}/dev.yml index 3eabb9012..a40a4f128 100644 --- a/{{cookiecutter.project_slug}}/dev.yml +++ b/{{cookiecutter.project_slug}}/dev.yml @@ -10,8 +10,8 @@ services: volumes: - postgres_data_dev:/var/lib/postgresql/data - postgres_backup_dev:/backups - environment: - - POSTGRES_USER={{cookiecutter.project_slug}} + env_file: + - dev.env django: build: @@ -20,8 +20,9 @@ services: command: /start-dev.sh depends_on: - postgres + env_file: + - dev.env environment: - - POSTGRES_USER={{cookiecutter.project_slug}} - USE_DOCKER=yes volumes: - .:/app @@ -40,8 +41,8 @@ services: dockerfile: ./compose/django/Dockerfile-dev depends_on: - postgres - environment: - - POSTGRES_USER={{cookiecutter.project_slug}} + env_file: + - dev.env volumes: - .:/app links: From ba07b53b69d367e70c2cc5e4d0b9fd4b56c21662 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 20 Mar 2017 16:57:17 +0300 Subject: [PATCH 2/4] Reference dev.yml's 'orphan' environment variables from dev.env This is to elaborate on the proposal made in #1082. Contain 'orphan' variables scattered all around dev.yml in a separate dev.env file which can be stored in VCS likewise the development-specific variables it defines are. N.B. `django` service's `USE_DOCKER=yes` variable left intact for its use to be isolated within the service only. --- {{cookiecutter.project_slug}}/dev.env | 4 ++++ {{cookiecutter.project_slug}}/dev.yml | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/dev.env diff --git a/{{cookiecutter.project_slug}}/dev.env b/{{cookiecutter.project_slug}}/dev.env new file mode 100644 index 000000000..cce84cfe1 --- /dev/null +++ b/{{cookiecutter.project_slug}}/dev.env @@ -0,0 +1,4 @@ +POSTGRES_USER={{cookiecutter.project_slug}} +POSTGRES_PASSWORD={{cookiecutter.project_slug}} +POSTGRES_DB={{cookiecutter.project_slug}} + diff --git a/{{cookiecutter.project_slug}}/dev.yml b/{{cookiecutter.project_slug}}/dev.yml index 3eabb9012..a40a4f128 100644 --- a/{{cookiecutter.project_slug}}/dev.yml +++ b/{{cookiecutter.project_slug}}/dev.yml @@ -10,8 +10,8 @@ services: volumes: - postgres_data_dev:/var/lib/postgresql/data - postgres_backup_dev:/backups - environment: - - POSTGRES_USER={{cookiecutter.project_slug}} + env_file: + - dev.env django: build: @@ -20,8 +20,9 @@ services: command: /start-dev.sh depends_on: - postgres + env_file: + - dev.env environment: - - POSTGRES_USER={{cookiecutter.project_slug}} - USE_DOCKER=yes volumes: - .:/app @@ -40,8 +41,8 @@ services: dockerfile: ./compose/django/Dockerfile-dev depends_on: - postgres - environment: - - POSTGRES_USER={{cookiecutter.project_slug}} + env_file: + - dev.env volumes: - .:/app links: From 4839639bd085b6e17ae840b235ae1bf9252b704e Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 11 Apr 2017 16:43:09 +0300 Subject: [PATCH 3/4] Fix linebreaks --- {{cookiecutter.project_slug}}/dev.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/dev.yml b/{{cookiecutter.project_slug}}/dev.yml index 6c28148f7..9c919c3e3 100644 --- a/{{cookiecutter.project_slug}}/dev.yml +++ b/{{cookiecutter.project_slug}}/dev.yml @@ -19,8 +19,10 @@ services: dockerfile: ./compose/django/Dockerfile-dev command: /start-dev.sh depends_on: - - postgres{% if cookiecutter.use_mailhog == 'y' %} - - mailhog{% endif %} + - postgres +{% if cookiecutter.use_mailhog == 'y' -%} + - mailhog +{%- endif %} env_file: - dev.env environment: From edfa060d794fea3e0ac152eb0fef90e18335ac68 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 24 Apr 2017 17:54:22 +0300 Subject: [PATCH 4/4] Rename dev.env to local.env --- {{cookiecutter.project_slug}}/dev.yml | 6 +++--- {{cookiecutter.project_slug}}/{dev.env => local.env} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename {{cookiecutter.project_slug}}/{dev.env => local.env} (100%) diff --git a/{{cookiecutter.project_slug}}/dev.yml b/{{cookiecutter.project_slug}}/dev.yml index 9c919c3e3..2b500de71 100644 --- a/{{cookiecutter.project_slug}}/dev.yml +++ b/{{cookiecutter.project_slug}}/dev.yml @@ -11,7 +11,7 @@ services: - postgres_data_dev:/var/lib/postgresql/data - postgres_backup_dev:/backups env_file: - - dev.env + - local.env django: build: @@ -24,7 +24,7 @@ services: - mailhog {%- endif %} env_file: - - dev.env + - local.env environment: - USE_DOCKER=yes volumes: @@ -40,7 +40,7 @@ services: depends_on: - postgres env_file: - - dev.env + - local.env volumes: - .:/app {% endif %} diff --git a/{{cookiecutter.project_slug}}/dev.env b/{{cookiecutter.project_slug}}/local.env similarity index 100% rename from {{cookiecutter.project_slug}}/dev.env rename to {{cookiecutter.project_slug}}/local.env