Add tini to catch signal

Author: mlima95

Dockerfile.14-apache-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
 COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
 
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

Dockerfile.14-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 CMD [ "node" ]
 
 
 
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

Dockerfile.16-apache-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
 COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
 
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

Dockerfile.16-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 CMD [ "node" ]
 
 
 
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

Dockerfile.18-apache-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
 COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
 
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

Dockerfile.18-bullseye

@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
 
+
 CMD [ "node" ]
 
 
 
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

utils/Dockerfile.blueprint

@@ -14,7 +14,7 @@ LABEL authors="Julien Neuhart <[email protected]>, David Négrier <
 # |
 
 RUN apt-get update &&\
-    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
+    apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
 
 # |--------------------------------------------------------------------------
 # | Supercronic
@@ -193,11 +193,14 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 {{ end }}
 
+
+
 COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
 COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
 COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
 
+
 {{ if eq $variant "apache" }}
 COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
 COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
@@ -230,4 +233,5 @@ CMD [ "node" ]
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+
 USER docker

utils/docker-entrypoint.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-exec "sudo" "-E" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";
+exec "sudo" "-E" "tini" "-s" "-v" "--" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";