Build for arm64

gparant · moufmouf · commit 59ba44e24980 · 2022-09-05T11:54:15.000+02:00
- Remove tini
diff --git a/Dockerfile.14-apache-bullseye b/Dockerfile.14-apache-bullseye
@@ -186,12 +186,6 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/Dockerfile.14-bullseye b/Dockerfile.14-bullseye
@@ -116,12 +116,6 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/Dockerfile.16-apache-bullseye b/Dockerfile.16-apache-bullseye
@@ -186,12 +186,6 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/Dockerfile.16-bullseye b/Dockerfile.16-bullseye
@@ -116,12 +116,6 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/Dockerfile.18-apache-bullseye b/Dockerfile.18-apache-bullseye
@@ -186,12 +186,6 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/Dockerfile.18-bullseye b/Dockerfile.18-bullseye
@@ -116,12 +116,6 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
 WORKDIR /usr/src/app
 
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.16.1
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-
 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
diff --git a/utils/Dockerfile.blueprint b/utils/Dockerfile.blueprint
@@ -193,12 +193,6 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
 WORKDIR /var/www/html
 {{ end }}
 
-# Add Tini (to be able to stop the container with ctrl-c.
-# See: https://github.com/krallin/tini
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-$( dpkg --print-architecture ) /tini
-RUN chmod +x /tini
-
 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
diff --git a/utils/docker-entrypoint.sh b/utils/docker-entrypoint.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-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" "$@";

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`set -e`
`4`	`4`
`5`		`-exec "sudo" "-E" "/tini" "-g" "-s" "--" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";`
	`5`	`+exec "sudo" "-E" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";`