Fix supercronic + allow build from specific image

mistraloz · mistraloz · commit 7edaece7d320 · 2022-09-01T19:40:56.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,10 @@
+/.git*
+/docker-bake.hcl
+/Dockerfile.*
+/Makefile
+/*.md
+/LICENSE
+/orbit*
+/test*
+/utils/*.blueprint.*
+/utils/*.blueprint
diff --git a/Dockerfile.apache b/Dockerfile.apache
@@ -4,7 +4,8 @@ ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.apache.node10 b/Dockerfile.apache.node10
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.apache.node12 b/Dockerfile.apache.node12
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.apache.node14 b/Dockerfile.apache.node14
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.apache.node16 b/Dockerfile.apache.node16
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -4,7 +4,8 @@ ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.cli.node10 b/Dockerfile.cli.node10
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.cli.node12 b/Dockerfile.cli.node12
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.cli.node14 b/Dockerfile.cli.node14
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.cli.node16 b/Dockerfile.cli.node16
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.fpm b/Dockerfile.fpm
@@ -4,7 +4,8 @@ ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.fpm.node10 b/Dockerfile.fpm.node10
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.fpm.node12 b/Dockerfile.fpm.node12
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.fpm.node14 b/Dockerfile.fpm.node14
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.fpm.node16 b/Dockerfile.fpm.node16
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm as baseapp
+ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm"
+FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 ARG TARGETOS
diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache
@@ -357,22 +357,21 @@ ONBUILD RUN sudo -E PHP_EXTENSIONS="$PHP_EXTENSIONS" /usr/local/bin/install_sele
 # |
 # | Supercronic is a drop-in replacement for cron (for containers).
 # |
-ENV SUPERCRONIC_OPTIONS=
+ENV SUPERCRONIC_OPTIONS=""
 ONBUILD ARG INSTALL_CRON
 ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
- SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-$TARGETOS-$TARGETARCH \
- && echo $SUPERCRONIC_URL \
- && SUPERCRONIC=supercronic-linux-${TARGETARCH} \
- && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
- && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
-    elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
- && curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
- && chmod +x "$SUPERCRONIC" \
- && sudo mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
- && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
- fi;
+     SUPERCRONIC="supercronic-${TARGETOS}-${TARGETARCH}" \
+     && SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/v0.1.9/${SUPERCRONIC}" \
+     && echo ${SUPERCRONIC_URL} \
+     && if [ "$TARGETARCH" = "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
+        elif [ "$TARGETARCH" = "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
+        else echo "Target arch '${TARGETARCH}' is not supported"; exit 1; fi \
+     && curl -fsSLO "${SUPERCRONIC_URL}" \
+     && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \
+     && chmod +x "${SUPERCRONIC}" \
+     && sudo mv "${SUPERCRONIC}" "/usr/local/bin/${SUPERCRONIC}" \
+     && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
+ fi
 
 
 # |--------------------------------------------------------------------------
diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli
@@ -262,22 +262,21 @@ ONBUILD RUN sudo -E PHP_EXTENSIONS="$PHP_EXTENSIONS" /usr/local/bin/install_sele
 # |
 # | Supercronic is a drop-in replacement for cron (for containers).
 # |
-ENV SUPERCRONIC_OPTIONS=
+ENV SUPERCRONIC_OPTIONS=""
 ONBUILD ARG INSTALL_CRON
 ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
- SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-$TARGETOS-$TARGETARCH \
- && echo $SUPERCRONIC_URL \
- && SUPERCRONIC=supercronic-linux-${TARGETARCH} \
- && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
- && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
-    elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
- && curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
- && chmod +x "$SUPERCRONIC" \
- && sudo mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
- && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
- fi;
+     SUPERCRONIC="supercronic-${TARGETOS}-${TARGETARCH}" \
+     && SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/v0.1.9/${SUPERCRONIC}" \
+     && echo ${SUPERCRONIC_URL} \
+     && if [ "$TARGETARCH" = "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
+        elif [ "$TARGETARCH" = "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
+        else echo "Target arch '${TARGETARCH}' is not supported"; exit 1; fi \
+     && curl -fsSLO "${SUPERCRONIC_URL}" \
+     && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \
+     && chmod +x "${SUPERCRONIC}" \
+     && sudo mv "${SUPERCRONIC}" "/usr/local/bin/${SUPERCRONIC}" \
+     && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
+ fi
 
 
 # |--------------------------------------------------------------------------
diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm
@@ -285,22 +285,21 @@ ONBUILD RUN sudo -E PHP_EXTENSIONS="$PHP_EXTENSIONS" /usr/local/bin/install_sele
 # |
 # | Supercronic is a drop-in replacement for cron (for containers).
 # |
-ENV SUPERCRONIC_OPTIONS=
+ENV SUPERCRONIC_OPTIONS=""
 ONBUILD ARG INSTALL_CRON
 ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
- SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-$TARGETOS-$TARGETARCH \
- && echo $SUPERCRONIC_URL \
- && SUPERCRONIC=supercronic-linux-${TARGETARCH} \
- && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
- && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
-    elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
- && curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
- && chmod +x "$SUPERCRONIC" \
- && sudo mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
- && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
- fi;
+     SUPERCRONIC="supercronic-${TARGETOS}-${TARGETARCH}" \
+     && SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/v0.1.9/${SUPERCRONIC}" \
+     && echo ${SUPERCRONIC_URL} \
+     && if [ "$TARGETARCH" = "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
+        elif [ "$TARGETARCH" = "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
+        else echo "Target arch '${TARGETARCH}' is not supported"; exit 1; fi \
+     && curl -fsSLO "${SUPERCRONIC_URL}" \
+     && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \
+     && chmod +x "${SUPERCRONIC}" \
+     && sudo mv "${SUPERCRONIC}" "/usr/local/bin/${SUPERCRONIC}" \
+     && sudo ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic; \
+ fi
 
 
 # |--------------------------------------------------------------------------
diff --git a/docker-bake.hcl b/docker-bake.hcl
diff --git a/utils/Dockerfile.blueprint b/utils/Dockerfile.blueprint
diff --git a/utils/Dockerfile.node.blueprint b/utils/Dockerfile.node.blueprint
diff --git a/utils/Dockerfile.slim.blueprint b/utils/Dockerfile.slim.blueprint
diff --git a/utils/docker-bake.blueprint.hcl b/utils/docker-bake.blueprint.hcl
