From 0877147b585cffe28e41909e98183c7cab0f0382 Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Wed, 6 Jan 2016 20:04:36 +0300 Subject: [PATCH 1/3] initial fixes for docker issue on windows 10 --- {{cookiecutter.repo_name}}/Dockerfile | 3 ++- {{cookiecutter.repo_name}}/Dockerfile-dev | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index 08d43f61..0cb397cd 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -16,7 +16,8 @@ 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 set -i 's/\r//' /guincorn.sh RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh diff --git a/{{cookiecutter.repo_name}}/Dockerfile-dev b/{{cookiecutter.repo_name}}/Dockerfile-dev index f07fe36a..c3f54a9e 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile-dev +++ b/{{cookiecutter.repo_name}}/Dockerfile-dev @@ -10,6 +10,7 @@ COPY ./requirements /requirements RUN pip install -r /requirements/local.txt COPY ./compose/django/entrypoint.sh /entrypoint.sh +RUN sed -i 's/\r//' /entrypoint.sh RUN chmod +x /entrypoint.sh WORKDIR /app From 640d1de8ac12ed106b796d209f02179e36e8e82b Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Thu, 7 Jan 2016 08:59:30 +0300 Subject: [PATCH 2/3] Update Dockerfile Typo --- {{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index 0cb397cd..79d08cf7 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -17,7 +17,7 @@ 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 set -i 's/\r//' /guincorn.sh +RUN sed -i 's/\r//' /guincorn.sh RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh From 30e0f2ace13637c1cb8c9ac6c96c1fb24ad06330 Mon Sep 17 00:00:00 2001 From: Jannis Gebauer Date: Fri, 8 Jan 2016 10:15:37 +0100 Subject: [PATCH 3/3] fixed typo --- {{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index 79d08cf7..f2f662d5 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -17,7 +17,7 @@ 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//' /guincorn.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