cron for production

compose/django/Dockerfile

@@ -19,7 +19,7 @@ RUN pip install -r /requirements.txt \
     && useradd -m -r -g django django
 
 RUN apt-get install -y ruby-dev rubygems
-RUN apt-get install -y cron
+RUN apt-get install -y cron rsyslog
 
 RUN gem install sass
 
@@ -35,8 +35,13 @@ RUN sed -i 's/\r//' /start.sh \
     && chmod +x /start.sh \
     && chown django /start.sh
 
-ADD chroniker_crontab /etc/cron.d/chroniker-cron
-RUN chmod 0644 /etc/cron.d/chroniker-cron
+COPY ./compose/django/configure_and_run_cron.sh /configure_and_run_cron.sh
+RUN chmod +x /configure_and_run_cron.sh \
+    && chown django /configure_and_run_cron.sh
+
+COPY ./compose/django/cron.sh /cron.sh
+RUN chmod +x /cron.sh \
+    && chown django /cron.sh
 
 WORKDIR /app
 

compose/django/Dockerfile-dev

@@ -17,8 +17,6 @@ RUN pip install steem
 RUN pip install -r /requirements.txt
 
 RUN apt-get install -y ruby-dev rubygems
-RUN apt-get install -y cron
-
 RUN gem install sass
 
 COPY ./compose/django/entrypoint.sh /entrypoint.sh
@@ -29,12 +27,6 @@ COPY ./compose/django/start-dev.sh /start-dev.sh
 RUN sed -i 's/\r//' /start-dev.sh
 RUN chmod +x /start-dev.sh
 
-COPY ./compose/django/start-cron-dev.sh /start-cron-dev.sh
-RUN chmod +x /start-cron-dev.sh
-
-COPY ./compose/django/cron.sh /cron.sh
-RUN chmod +x /cron.sh
-
 WORKDIR /app
 
 ENTRYPOINT ["/entrypoint.sh"]

compose/django/configure_and_run_cron.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+dotenv list > /tmp/env
+sed -i 's/^/export /' /tmp/env
+
+echo "* * * * * django /cron.sh" > /etc/cron.d/django
+
+rsyslogd
+cron
+tail -f /var/log/syslog

compose/django/cron.sh

@@ -1,6 +1,5 @@
-set -a
-. /app/.env.local
-set +a
+#!/bin/bash
 
-/usr/local/bin/chroniker -p /app/ -s settings.test
-#python /app/manage.py cron 
+source /etc/profile
+source /tmp/env
+/entrypoint.sh python /app/manage.py cron >> /app/cron-logs 2>&1

compose/django/start.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 ./bin/apply_theme.sh
 sass --update --force static/scss:static/css
-cron -f&
 python manage.py migrate
 python /app/manage.py collectstatic --noinput
 /usr/local/bin/uwsgi --http :5000 \

dev.yml

@@ -30,22 +30,3 @@ services:
       - postgres
     env_file:
       - .env.local
-
-  django-chroniker:
-    build:
-      context: .
-      dockerfile: ./compose/django/Dockerfile-dev
-    command: /start-cron-dev.sh
-    depends_on:
-      - postgres
-      - redis
-      - django
-    volumes:
-      - .:/app
-    links:
-      - postgres
-    env_file:
-      - .env.local
-
-  redis:
-    build: ./compose/redis

docker-compose.yml

@@ -46,5 +46,18 @@ services:
     command: /start.sh
     env_file: .env
 
+  django-chroniker:
+    build:
+      context: .
+      dockerfile: ./compose/django/Dockerfile
+    command: /configure_and_run_cron.sh
+    depends_on:
+      - postgres
+      - redis
+    links:
+      - postgres
+    env_file:
+      - .env
+
   redis:
     build: ./compose/redis

fabfile.py

@@ -123,6 +123,7 @@ def deploy(branch="master"):
         time.sleep(10)
 
         _build_and_restart("django-b")
+        _build_and_restart("django-chroniker")
         docker_compose("run django-a python manage.py searchv2_build")
 
 

requirements.txt

@@ -35,6 +35,7 @@ whitenoise==3.2.2
 Pillow==4.2.1
 rocketchat-API==0.6.3
 markdown==2.6.11
+python-dotenv==0.8.0
 
 # Redis support
 django-redis==4.6.0