Docker optimisations :

* Allow to change related repository with ARG
* Allow to suffix tag with ARG
* Allow to change FROM_IMAGE with ARG (to allow some optimisation in docker bake with precedences)
* Use ARG instead of `Dockerfile.${VARIANT}.node{10,12,14,16}` files
* Use `SHELL ["/bin/bash", "-o", "pipefail", "-c"]` mode for Dockerfile
* Specify version of Dockerfile avec v1 `#syntax=docker/dockerfile-upstream:1`
* Reduce `RUN` steps
* Upgrade tini to v0.19
* Fix supercronic installation
* Fix npm version built in slim mode
* Add .dockerignore to optimise build time and memory

Author: mistraloz

.dockerignore

@@ -0,0 +1,10 @@
+/.git*
+/docker-bake.hcl
+/Dockerfile.*
+/Makefile
+/*.md
+/LICENSE
+/orbit*
+/test*
+/utils/*.blueprint.*
+/utils/*.blueprint

Dockerfile.apache

@@ -1,11 +1,16 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
 
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache as baseapp
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.apache.node14 renamed to Dockerfile.apache.node

@@ -1,25 +1,31 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG BLACKFIRE_VERSION=1
+ARG NODE_VERSION=16
 
 USER root
 
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
     apt-get update && \
     apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
     apt-get install -y --no-install-recommends yarn && \
-    npm install -g npm && \
+    if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

Dockerfile.apache.node16

@@ -1,11 +1,16 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
 
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli as baseapp
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.cli

@@ -1,25 +1,31 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG BLACKFIRE_VERSION=1
+ARG NODE_VERSION=16
 
 USER root
 
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
     apt-get update && \
     apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
     apt-get install -y --no-install-recommends yarn && \
-    npm install -g npm@^6.14 && \
+    if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*