From 0877147b585cffe28e41909e98183c7cab0f0382 Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Wed, 6 Jan 2016 20:04:36 +0300 Subject: [PATCH] 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