From c50c6a73be4691bbab03818c2482e59f57e73515 Mon Sep 17 00:00:00 2001 From: Wan Liuyang Date: Mon, 28 Aug 2017 16:00:59 +0800 Subject: [PATCH] Rename Dockerfile-dev to Dockerfile-local (#1305) * Rename Dockerfile-dev to Dockerfile-local * Add @sfdye to CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 2 ++ .../compose/django/{Dockerfile-dev => Dockerfile-local} | 0 {{cookiecutter.project_slug}}/local.yml | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename {{cookiecutter.project_slug}}/compose/django/{Dockerfile-dev => Dockerfile-local} (100%) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index f57280e5..e46c5209 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -146,6 +146,7 @@ Listed in alphabetical order. Travis McNeill `@Travistock`_ @tavistock_esq Vitaly Babiy Vivian Guillen `@viviangb`_ + Wan Liuyang `@sfdye`_ @sfdye Will Farley `@goldhand`_ @g01dhand William Archinal `@archinal`_ Yaroslav Halchenko @@ -223,6 +224,7 @@ Listed in alphabetical order. .. _@shireenrao: https://github.com/shireenrao .. _@webyneter: https://github.com/webyneter .. _@show0k: https://github.com/show0k +.. _@sfdye: https://github.com/sfdye .. _@shultz: https://github.com/shultz .. _@siauPatrick: https://github.com/siauPatrick .. _@slafs: https://github.com/slafs diff --git a/{{cookiecutter.project_slug}}/compose/django/Dockerfile-dev b/{{cookiecutter.project_slug}}/compose/django/Dockerfile-local similarity index 100% rename from {{cookiecutter.project_slug}}/compose/django/Dockerfile-dev rename to {{cookiecutter.project_slug}}/compose/django/Dockerfile-local diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 94562b9c..40a6d011 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -8,7 +8,7 @@ services: django: &django build: context: . - dockerfile: ./compose/django/Dockerfile-dev + dockerfile: ./compose/django/Dockerfile-local depends_on: - postgres{% if cookiecutter.use_mailhog == 'y' %} - mailhog{% endif %} @@ -32,7 +32,7 @@ services: pycharm: build: context: . - dockerfile: ./compose/django/Dockerfile-dev + dockerfile: ./compose/django/Dockerfile-local depends_on: - postgres environment: