HOTFIX : Disable tini (didn't work properly with arm)

Author: mistraloz

Dockerfile.slim.apache

@@ -294,12 +294,12 @@ RUN sed -i 's#/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#/usr/
 
 ENV IMAGE_VARIANT=apache
 
-# Add Tini (to be able to stop the container with ctrl-c).
-# See: https://github.com/krallin/tini
-# FIX https://github.com/krallin/tini/pull/67
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
-RUN chmod +x /tini
+## Add Tini (to be able to stop the container with ctrl-c).
+## See: https://github.com/krallin/tini
+## FIX https://github.com/krallin/tini/pull/67
+#ENV TINI_VERSION v0.19.0
+#ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+#RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php

Dockerfile.slim.cli

@@ -220,12 +220,12 @@ RUN sed -i 's#/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#/usr/
 
 ENV IMAGE_VARIANT=cli
 
-# Add Tini (to be able to stop the container with ctrl-c).
-# See: https://github.com/krallin/tini
-# FIX https://github.com/krallin/tini/pull/67
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
-RUN chmod +x /tini
+## Add Tini (to be able to stop the container with ctrl-c).
+## See: https://github.com/krallin/tini
+## FIX https://github.com/krallin/tini/pull/67
+#ENV TINI_VERSION v0.19.0
+#ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+#RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php

Dockerfile.slim.fpm

@@ -233,12 +233,12 @@ RUN sed -i 's#/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#/usr/
 
 ENV IMAGE_VARIANT=fpm
 
-# Add Tini (to be able to stop the container with ctrl-c).
-# See: https://github.com/krallin/tini
-# FIX https://github.com/krallin/tini/pull/67
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
-RUN chmod +x /tini
+## Add Tini (to be able to stop the container with ctrl-c).
+## See: https://github.com/krallin/tini
+## FIX https://github.com/krallin/tini/pull/67
+#ENV TINI_VERSION v0.19.0
+#ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+#RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php

utils/Dockerfile.slim.blueprint

@@ -309,12 +309,12 @@ RUN sed -i 's#/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#/usr/
 
 ENV IMAGE_VARIANT={{ .Orbit.variant }}
 
-# Add Tini (to be able to stop the container with ctrl-c).
-# See: https://github.com/krallin/tini
-# FIX https://github.com/krallin/tini/pull/67
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
-RUN chmod +x /tini
+## Add Tini (to be able to stop the container with ctrl-c).
+## See: https://github.com/krallin/tini
+## FIX https://github.com/krallin/tini/pull/67
+#ENV TINI_VERSION v0.19.0
+#ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+#RUN chmod +x /tini
 
 COPY utils/generate_cron.php /usr/local/bin/generate_cron.php
 COPY utils/startup_commands.php /usr/local/bin/startup_commands.php

utils/docker-entrypoint.sh

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

utils/generate_cron.php

@@ -4,8 +4,6 @@
  * The script is run on each start of the container.
  */
 
-$tiniPid = $argv[1];
-
 $found = false;
 
 foreach ($_SERVER as $key => $command) {