From faa534b3c1b96fb0f24725e6fc39bccf2dae8ff5 Mon Sep 17 00:00:00 2001 From: Jay Date: Sun, 4 Oct 2015 12:13:42 +0200 Subject: [PATCH] Enhances #360 --- {{cookiecutter.repo_name}}/Dockerfile | 2 +- {{cookiecutter.repo_name}}/Dockerfile-dev | 2 +- {{cookiecutter.repo_name}}/dev.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index b7933b216..2a038555b 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -6,7 +6,7 @@ FROM python:2.7 ENV PYTHONUNBUFFERED 1 # Requirements have to be pulled and installed here, otherwise caching won't work -ADD ./requirements/production.txt /requirements/production.txt +ADD ./requirements /requirements RUN pip install -r /requirements/production.txt diff --git a/{{cookiecutter.repo_name}}/Dockerfile-dev b/{{cookiecutter.repo_name}}/Dockerfile-dev index 6f6d061b9..f382b9133 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile-dev +++ b/{{cookiecutter.repo_name}}/Dockerfile-dev @@ -6,7 +6,7 @@ FROM python:2.7 ENV PYTHONUNBUFFERED 1 # Requirements have to be pulled and installed here, otherwise caching won't work -ADD ./requirements/local.txt /requirements/local.txt +ADD ./requirements /requirements RUN pip install -r /requirements/local.txt diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml index 4993ef759..63b172d39 100644 --- a/{{cookiecutter.repo_name}}/dev.yml +++ b/{{cookiecutter.repo_name}}/dev.yml @@ -1,4 +1,3 @@ -dockerfile: Dockerfile-dev postgres: image: postgres @@ -8,6 +7,7 @@ postgres: - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data django: + dockerfile: Dockerfile-dev build: . command: python /app/manage.py runserver_plus 0.0.0.0:8000 volumes: