Multiarch Implementation

andersonpem · andersonpem · commit bbb8ea0c5562 · 2022-06-17T16:46:33.000+01:00
diff --git a/Dockerfile.apache b/Dockerfile.apache
@@ -1,9 +1,18 @@
 # 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
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache
+
+ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
+
+ENV CONTAINER_OS=${TARGETOS}
+ENV CONTAINER_ARCH=${TARGETARCH}
+
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
diff --git a/Dockerfile.apache.node10 b/Dockerfile.apache.node10
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.apache.node12 b/Dockerfile.apache.node12
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_12.x | bash - && \
diff --git a/Dockerfile.apache.node14 b/Dockerfile.apache.node14
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.apache.node16 b/Dockerfile.apache.node16
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_16.x | bash - && \
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,9 +1,18 @@
 # 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
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli
+
+ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
+
+ENV CONTAINER_OS=${TARGETOS}
+ENV CONTAINER_ARCH=${TARGETARCH}
+
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
diff --git a/Dockerfile.cli.node10 b/Dockerfile.cli.node10
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.cli.node12 b/Dockerfile.cli.node12
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_12.x | bash - && \
diff --git a/Dockerfile.cli.node14 b/Dockerfile.cli.node14
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.cli.node16 b/Dockerfile.cli.node16
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_16.x | bash - && \
diff --git a/Dockerfile.fpm b/Dockerfile.fpm
@@ -1,9 +1,18 @@
 # 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
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm
+
+ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
+
+ENV CONTAINER_OS=${TARGETOS}
+ENV CONTAINER_ARCH=${TARGETARCH}
+
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
diff --git a/Dockerfile.fpm.node10 b/Dockerfile.fpm.node10
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.fpm.node12 b/Dockerfile.fpm.node12
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_12.x | bash - && \
diff --git a/Dockerfile.fpm.node14 b/Dockerfile.fpm.node14
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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 - && \
diff --git a/Dockerfile.fpm.node16 b/Dockerfile.fpm.node16
@@ -1,12 +1,17 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
+
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
 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_16.x | bash - && \
diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM ubuntu:20.04
+
+FROM --platform=$BUILDPLATFORM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
@@ -11,6 +12,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ARG PHP_VERSION
 ENV PHP_VERSION=$PHP_VERSION
+ONBUILD ARG TARGETOS TARGETARCH
+ARG TARGETOS TARGETARCH
+
+ARG BLACKFIRE_VERSION=1
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 # |--------------------------------------------------------------------------
 # | Main PHP extensions
@@ -287,7 +293,7 @@ ENV IMAGE_VARIANT=apache
 # 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
+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
@@ -349,14 +355,14 @@ 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=
-
 ONBUILD ARG INSTALL_CRON
 ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
- SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-linux-amd64 \
- && SUPERCRONIC=supercronic-linux-amd64 \
+ 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 \
  && curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
+#  && 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; \
diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli
@@ -1,5 +1,6 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM ubuntu:20.04
+
+FROM --platform=$BUILDPLATFORM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
 
@@ -11,6 +12,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ARG PHP_VERSION
 ENV PHP_VERSION=$PHP_VERSION
+ONBUILD ARG TARGETOS TARGETARCH
+ARG TARGETOS TARGETARCH
+
+ARG BLACKFIRE_VERSION=1
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 # |--------------------------------------------------------------------------
 # | Main PHP extensions
@@ -213,7 +219,7 @@ ENV IMAGE_VARIANT=cli
 # 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
+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
@@ -254,14 +260,14 @@ 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=
-
 ONBUILD ARG INSTALL_CRON
 ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
- SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-linux-amd64 \
- && SUPERCRONIC=supercronic-linux-amd64 \
+ 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 \
  && curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
+#  && 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; \
diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm
diff --git a/README.md b/README.md
diff --git a/build-and-test.sh b/build-and-test.sh
diff --git a/extensions/core/blackfire/install.sh b/extensions/core/blackfire/install.sh
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/README.blueprint.md b/utils/README.blueprint.md
