diff options
Diffstat (limited to 'compose/production/django/Dockerfile')
| -rw-r--r-- | compose/production/django/Dockerfile | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile index 6e816f1..e81a03c 100644 --- a/compose/production/django/Dockerfile +++ b/compose/production/django/Dockerfile @@ -57,28 +57,26 @@ COPY --from=python-build-stage /usr/src/app/wheels /wheels/ RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \ && rm -rf /wheels/ +# COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint +# RUN sed -i 's/\r$//g' /entrypoint +# RUN chmod +x /entrypoint -COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint -RUN sed -i 's/\r$//g' /entrypoint -RUN chmod +x /entrypoint +# COPY --chown=django:django ./compose/production/django/start /start +# RUN sed -i 's/\r$//g' /start +# RUN chmod +x /start +# COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker +# RUN sed -i 's/\r$//g' /start-celeryworker +# RUN chmod +x /start-celeryworker -COPY --chown=django:django ./compose/production/django/start /start -RUN sed -i 's/\r$//g' /start -RUN chmod +x /start -COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker -RUN sed -i 's/\r$//g' /start-celeryworker -RUN chmod +x /start-celeryworker +# COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat +# RUN sed -i 's/\r$//g' /start-celerybeat +# RUN chmod +x /start-celerybeat -COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat -RUN sed -i 's/\r$//g' /start-celerybeat -RUN chmod +x /start-celerybeat - - -COPY --chown=django:django ./compose/production/django/celery/flower/start /start-flower -RUN sed -i 's/\r$//g' /start-flower -RUN chmod +x /start-flower +# COPY --chown=django:django ./compose/production/django/celery/flower/start /start-flower +# RUN sed -i 's/\r$//g' /start-flower +# RUN chmod +x /start-flower # copy application code to WORKDIR @@ -89,9 +87,5 @@ RUN chown -R django:django ${APP_HOME} USER django -RUN DATABASE_URL="" \ - CELERY_BROKER_URL="" \ - DJANGO_SETTINGS_MODULE="config.settings.test" \ - python manage.py compilemessages - -ENTRYPOINT ["/entrypoint"] +RUN chmod +x docker-entrypoint.sh +ENTRYPOINT ["/app/docker-entrypoint.sh"] |