From 7d7eb787732762d693e9956d082d99c3bf2399a0 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Sat, 9 Jun 2018 14:51:54 +0300 Subject: [PATCH] Remove duplicate Docker Compose service configuration Rationale: those sections will always be there thanks to inheritance --- {{cookiecutter.project_slug}}/local.yml | 6 ------ {{cookiecutter.project_slug}}/production.yml | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index c725fff7..5ad26dfd 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -56,9 +56,6 @@ services: {% if cookiecutter.use_mailhog == 'y' -%} - mailhog {%- endif %} - env_file: - - ./.envs/.local/.django - - ./.envs/.local/.postgres ports: [] command: /start-celeryworker @@ -71,9 +68,6 @@ services: {% if cookiecutter.use_mailhog == 'y' -%} - mailhog {%- endif %} - env_file: - - ./.envs/.local/.django - - ./.envs/.local/.postgres ports: [] command: /start-celerybeat diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index c7619751..4ee178d8 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -52,23 +52,11 @@ services: celeryworker: <<: *django image: {{ cookiecutter.project_slug }}_production_celeryworker - depends_on: - - postgres - - redis - env_file: - - ./.envs/.production/.django - - ./.envs/.production/.postgres command: /start-celeryworker celerybeat: <<: *django image: {{ cookiecutter.project_slug }}_production_celerybeat - depends_on: - - postgres - - redis - env_file: - - ./.envs/.production/.django - - ./.envs/.production/.postgres command: /start-celerybeat {%- endif %}