Celery jinja conditions in Django Dockerfiles

This commit is contained in:
Nikita P. Shupeyko 2018-03-27 18:14:48 +03:00
parent f988ffbbf2
commit ba43d66793
2 changed files with 4 additions and 4 deletions

View File

@ -26,7 +26,7 @@ RUN chmod +x /entrypoint.sh
COPY ./compose/local/django/start.sh /start.sh COPY ./compose/local/django/start.sh /start.sh
RUN sed -i 's/\r//' /start.sh RUN sed -i 's/\r//' /start.sh
RUN chmod +x /start.sh RUN chmod +x /start.sh
{% if cookiecutter.use_celery == "y" %}
COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh
RUN sed -i 's/\r//' /start-celeryworker.sh RUN sed -i 's/\r//' /start-celeryworker.sh
RUN chmod +x /start-celeryworker.sh RUN chmod +x /start-celeryworker.sh
@ -34,7 +34,7 @@ RUN chmod +x /start-celeryworker.sh
COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh
RUN sed -i 's/\r//' /start-celerybeat.sh RUN sed -i 's/\r//' /start-celerybeat.sh
RUN chmod +x /start-celerybeat.sh RUN chmod +x /start-celerybeat.sh
{% endif %}
WORKDIR /app WORKDIR /app
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]

View File

@ -28,7 +28,7 @@ COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
RUN sed -i 's/\r//' /entrypoint.sh RUN sed -i 's/\r//' /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
RUN chown django /entrypoint.sh RUN chown django /entrypoint.sh
{% if cookiecutter.use_celery == "y" %}
COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh
RUN sed -i 's/\r//' /start-celeryworker.sh RUN sed -i 's/\r//' /start-celeryworker.sh
RUN chmod +x /start-celeryworker.sh RUN chmod +x /start-celeryworker.sh
@ -36,7 +36,7 @@ RUN chmod +x /start-celeryworker.sh
COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh
RUN sed -i 's/\r//' /start-celerybeat.sh RUN sed -i 's/\r//' /start-celerybeat.sh
RUN chmod +x /start-celerybeat.sh RUN chmod +x /start-celerybeat.sh
{% endif %}
COPY . /app COPY . /app
RUN chown -R django /app RUN chown -R django /app