cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-30 13:34:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix removal carriage returns in docker scripts (#2116)

Browse Source 
Fix removal carriage returns in docker scripts
This commit is contained in:
Bruno Alla 2019-06-19 10:18:50 +01:00 committed by GitHub
commit f49eac048c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.rst
View File

@ -180,6 +180,7 @@ Listed in alphabetical order.
Tano Abeleyra `@tanoabeleyra`_ Tano Abeleyra `@tanoabeleyra`_
Taylor Baldwin Taylor Baldwin
Théo Segonds `@show0k`_ Théo Segonds `@show0k`_
Tim Claessens `@timclaessens`
Tim Freund `@timfreund`_ Tim Freund `@timfreund`_
Tom Atkins `@knitatoms`_ Tom Atkins `@knitatoms`_
Tom Offermann Tom Offermann
@ -292,6 +293,7 @@ Listed in alphabetical order.
.. _@stepmr: https://github.com/stepmr .. _@stepmr: https://github.com/stepmr
.. _@suledev: https://github.com/suledev .. _@suledev: https://github.com/suledev
.. _@takkaria: https://github.com/takkaria .. _@takkaria: https://github.com/takkaria
.. _@timclaessens: https://github.com/timclaessens
.. _@timfreund: https://github.com/timfreund .. _@timfreund: https://github.com/timfreund
.. _@Travistock: https://github.com/Tavistock .. _@Travistock: https://github.com/Tavistock
.. _@trungdong: https://github.com/trungdong .. _@trungdong: https://github.com/trungdong

10
{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
View File

@ -20,23 +20,23 @@ COPY ./requirements /requirements
RUN pip install -r /requirements/local.txt RUN pip install -r /requirements/local.txt
COPY ./compose/production/django/entrypoint /entrypoint COPY ./compose/production/django/entrypoint /entrypoint
RUN sed -i 's/\r//' /entrypoint RUN sed -i 's/\r$//g' /entrypoint
RUN chmod +x /entrypoint RUN chmod +x /entrypoint
COPY ./compose/local/django/start /start COPY ./compose/local/django/start /start
RUN sed -i 's/\r//' /start RUN sed -i 's/\r$//g' /start
RUN chmod +x /start RUN chmod +x /start
{% if cookiecutter.use_celery == "y" %} {% if cookiecutter.use_celery == "y" %}
COPY ./compose/local/django/celery/worker/start /start-celeryworker COPY ./compose/local/django/celery/worker/start /start-celeryworker
RUN sed -i 's/\r//' /start-celeryworker RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker RUN chmod +x /start-celeryworker
COPY ./compose/local/django/celery/beat/start /start-celerybeat COPY ./compose/local/django/celery/beat/start /start-celerybeat
RUN sed -i 's/\r//' /start-celerybeat RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat RUN chmod +x /start-celerybeat
COPY ./compose/local/django/celery/flower/start /start-flower COPY ./compose/local/django/celery/flower/start /start-flower
RUN sed -i 's/\r//' /start-flower RUN sed -i 's/\r$//g' /start-flower
RUN chmod +x /start-flower RUN chmod +x /start-flower
{% endif %} {% endif %}
WORKDIR /app WORKDIR /app

10
{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
View File

@ -31,28 +31,28 @@ RUN pip install --no-cache-dir -r /requirements/production.txt \
&& rm -rf /requirements && rm -rf /requirements
COPY ./compose/production/django/entrypoint /entrypoint COPY ./compose/production/django/entrypoint /entrypoint
RUN sed -i 's/\r//' /entrypoint RUN sed -i 's/\r$//g' /entrypoint
RUN chmod +x /entrypoint RUN chmod +x /entrypoint
RUN chown django /entrypoint RUN chown django /entrypoint
COPY ./compose/production/django/start /start COPY ./compose/production/django/start /start
RUN sed -i 's/\r//' /start RUN sed -i 's/\r$//g' /start
RUN chmod +x /start RUN chmod +x /start
RUN chown django /start RUN chown django /start
{%- if cookiecutter.use_celery == "y" %} {%- if cookiecutter.use_celery == "y" %}
COPY ./compose/production/django/celery/worker/start /start-celeryworker COPY ./compose/production/django/celery/worker/start /start-celeryworker
RUN sed -i 's/\r//' /start-celeryworker RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker RUN chmod +x /start-celeryworker
RUN chown django /start-celeryworker RUN chown django /start-celeryworker
COPY ./compose/production/django/celery/beat/start /start-celerybeat COPY ./compose/production/django/celery/beat/start /start-celerybeat
RUN sed -i 's/\r//' /start-celerybeat RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat RUN chmod +x /start-celerybeat
RUN chown django /start-celerybeat RUN chown django /start-celerybeat
COPY ./compose/production/django/celery/flower/start /start-flower COPY ./compose/production/django/celery/flower/start /start-flower
RUN sed -i 's/\r//' /start-flower RUN sed -i 's/\r$//g' /start-flower
RUN chmod +x /start-flower RUN chmod +x /start-flower
{%- endif %} {%- endif %}