From 8a7ae379ed0ededce65df696ae4586aa80d5434b Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 4 Sep 2017 20:51:25 +0300 Subject: [PATCH] Commit missing files That was weird: git failed to commit one specific folder previously --- .../compose/local/django/Dockerfile | 27 +++++++++++++++++++ .../compose/local/django/celery/beat/start.sh | 10 +++++++ .../local/django/celery/worker/start.sh | 9 +++++++ .../compose/local/django/start.sh | 10 +++++++ 4 files changed, 56 insertions(+) create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/start.sh diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile new file mode 100644 index 000000000..e62b524a4 --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -0,0 +1,27 @@ +FROM python:3.5 + +ENV PYTHONUNBUFFERED 1 + +# Requirements have to be pulled and installed here, otherwise caching won't work +COPY ./requirements /requirements +RUN pip install -r /requirements/local.txt + +COPY ./compose/production/django/entrypoint.sh /entrypoint.sh +RUN sed -i 's/\r//' /entrypoint.sh +RUN chmod +x /entrypoint.sh + +COPY ./compose/local/django/start.sh /start.sh +RUN sed -i 's/\r//' /start.sh +RUN chmod +x /start.sh + +COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh +RUN sed -i 's/\r//' /start-celeryworker.sh +RUN chmod +x /start-celeryworker.sh + +COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh +RUN sed -i 's/\r//' /start-celerybeat.sh +RUN chmod +x /start-celerybeat.sh + +WORKDIR /app + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh new file mode 100644 index 000000000..c26318b44 --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset +set -o xtrace + + +rm -f './celerybeat.pid' +celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh new file mode 100644 index 000000000..8b50c8cfd --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset +set -o xtrace + + +celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/start.sh new file mode 100644 index 000000000..cf4a41667 --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/django/start.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -o errexit +set -o pipefail +set -o nounset +set -o xtrace + + +python manage.py migrate +python manage.py runserver_plus 0.0.0.0:8000