From dc493fb14e5641b4f30a5f23b6d99c956ed55bcf Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 13 Mar 2021 00:02:00 +0100
Subject: [PATCH] [Docker] Add dumb-init so we get correct signal processing to
 uWSGI

En passant, this removes the need to force the entrypoint away if
wanting to spawn a shell in the container
---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4894c3295..d2ca7e56c 100644
--- a/Dockerfile
+++ b/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 \
@@ -54,7 +55,8 @@ 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"]
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["/usr/local/bin/entrypoint.sh"]
 
 # Install assets
 FROM core as assets
-- 
GitLab