From a6c803aaebebeb45a72271ac15c6ccab1b998ca9 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Sat, 11 Jun 2016 21:22:35 -0700 Subject: [PATCH] Combine RUN commands --- .../compose/django/Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/django/Dockerfile index f2f662d5..0123c58a 100644 --- a/{{cookiecutter.project_slug}}/compose/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/django/Dockerfile @@ -8,18 +8,21 @@ ENV PYTHONUNBUFFERED 1 # Requirements have to be pulled and installed here, otherwise caching won't work COPY ./requirements /requirements -RUN pip install -r /requirements/production.txt +RUN pip install -r /requirements/production.txt \ + && groupadd -r django \ + && useradd -r -g django django -RUN groupadd -r django && useradd -r -g django django COPY . /app RUN chown -R django /app COPY ./compose/django/gunicorn.sh /gunicorn.sh COPY ./compose/django/entrypoint.sh /entrypoint.sh -RUN sed -i 's/\r//' /entrypoint.sh -RUN sed -i 's/\r//' /gunicorn.sh -RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh -RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh +RUN sed -i 's/\r//' /entrypoint.sh \ + && sed -i 's/\r//' /gunicorn.sh \ + && chmod +x /entrypoint.sh \ + && chown django /entrypoint.sh \ + && chmod +x /gunicorn.sh \ + && chown django /gunicorn.sh WORKDIR /app