Merge branch 'feature/docker-rewrite-entrypoint' into 'master'

[Docker] Rewrite entrypoint

See merge request !525

Dockerfile

@@ -25,6 +25,7 @@ RUN apt-get -y update && \
     eatmydata apt-get -y upgrade && \
     eatmydata apt-get install -y --no-install-recommends \
         build-essential \
+	dumb-init \
 	gettext \
 	libpq5 \
 	libpq-dev \
@@ -53,8 +54,9 @@ VOLUME /var/lib/aleksis
 
 # Define entrypoint and uWSGI running on port 8000
 EXPOSE 8000
-COPY docker-entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY docker-startup.sh /usr/local/bin/aleksis-docker-startup
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["/usr/local/bin/aleksis-docker-startup"]
 
 # Install assets
 FROM core as assets

aleksis/core/settings.py

@@ -533,7 +533,7 @@ CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
 if _settings.get("celery.email", False):
     EMAIL_BACKEND = "djcelery_email.backends.CeleryEmailBackend"
 
-if _settings.get("dev.uwsgi.celery", True):
+if _settings.get("dev.uwsgi.celery", DEBUG):
     concurrency = _settings.get("celery.uwsgi.concurrency", 2)
     UWSGI.setdefault("attach-daemon", [])
     UWSGI["attach-daemon"].append(f"celery -A aleksis.core worker --concurrency={concurrency}")

docker-entrypoint.sh → docker-startup.sh

@@ -22,12 +22,4 @@ aleksis-admin createinitialrevisions
 aleksis-admin compilescss
 aleksis-admin collectstatic --no-input --clear
 
-ARG=${1:-uwsgi}
-
-if [ $ARG = "celery_worker" ]; then
-    exec celery -A aleksis.core worker
-elif [ $ARG = "celery_beat" ]; then
-    exec celery -A aleksis.core beat
-else
-    exec aleksis-admin runuwsgi http=$HTTP_PORT
-fi
+exec aleksis-admin runuwsgi http=$HTTP_PORT