Build (optional) multi arch support into our build toolkit

Author: WyriHaximus

.github/workflows/ci.yml

@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:experimental
 FROM php:7.2-cli-alpine3.7 as cli
+ARG TARGETOS
+ARG TARGETARCH
 
 # Add usabilla user and group
 RUN set -x \

Dockerfile-cli

@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:experimental
 FROM php:7.2-fpm-alpine3.7 as fpm
+ARG TARGETOS
+ARG TARGETARCH
 
 ENV FCGI_CONNECT=/var/run/php-fpm.sock
 ENV PHP_FPM_PM=dynamic

Dockerfile-fpm

@@ -1,4 +1,4 @@
-FROM nginx:1.15-alpine as http
+FROM nginx:1.15-alpine AS http
 
 # Add usabilla user and group
 RUN set -x \
@@ -37,6 +37,6 @@ CMD ["docker-nginx-entrypoint"]
 # this can be overriden in the child images
 HEALTHCHECK NONE
 
-FROM http as http-dev
+FROM http AS http-dev
 
 ENV NGINX_EXPOSE_VERSION=on

Dockerfile-http

@@ -15,17 +15,24 @@ declare -r IMAGE_ORIGINAL_TAG="nginx:1.[0-9][0-9]?-alpine"
 
 declare -r IMAGE_TAG="nginx:${VERSION_NGINX}-alpine"
 declare -r USABILLA_TAG_PREFIX="usabillabv/php"
-declare -r USABILLA_TAG="${USABILLA_TAG_PREFIX}:nginx${VERSION_NGINX}"
+if [[ ! -v DOCKER_BUILD_PLATFORM ]]; then
+   DOCKER_BUILD_FLAGS=""
+   declare -r USABILLA_TAG_SUFFIX=""
+else
+   DOCKER_BUILD_FLAGS="--platform="${DOCKER_BUILD_PLATFORM}""
+   declare -r USABILLA_TAG_SUFFIX="-$(echo "${DOCKER_BUILD_PLATFORM}" | cut -d "/" -f 2)"
+fi
+declare -r USABILLA_TAG="${USABILLA_TAG_PREFIX}:nginx${VERSION_NGINX}${USABILLA_TAG_SUFFIX}"
 declare -r USABILLA_TAG_DEV="${USABILLA_TAG}-dev"
 
-TAG_FILE="./tmp/build-${IMAGE}.tags"
+TAG_FILE="./tmp/build-${IMAGE}${USABILLA_TAG_SUFFIX}.tags"
 
 sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG}" \
-    --build-arg=NGINX_VHOST_TEMPLATE=php-fpm --target="${IMAGE}" -f - . \
+    --build-arg=NGINX_VHOST_TEMPLATE=php-fpm --target="${IMAGE}" ${DOCKER_BUILD_FLAGS} -f - . \
     && echo "${USABILLA_TAG}" >> "${TAG_FILE}"
 
 sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG_DEV}" \
-    --build-arg=NGINX_VHOST_TEMPLATE=php-fpm --target="${IMAGE}-dev" -f - . \
+    --build-arg=NGINX_VHOST_TEMPLATE=php-fpm --target="${IMAGE}-dev" ${DOCKER_BUILD_FLAGS} -f - . \
     && echo "$USABILLA_TAG_DEV" >> "${TAG_FILE}"
 
 for IMAGE_EXTRA_TAG in "${@:2}"

build-http.sh

@@ -16,13 +16,20 @@ declare -r VERSION_ALPINE=$3
 declare -r IMAGE_ORIGINAL_TAG="7.[0-9]-${IMAGE}-alpine3.[0-9]"
 
 declare -r IMAGE_TAG="${VERSION_PHP}-${IMAGE}-alpine${VERSION_ALPINE}"
-declare -r USABILLA_TAG="usabillabv/php:${VERSION_PHP}-${IMAGE}-alpine${VERSION_ALPINE}"
+if [[ ! -v DOCKER_BUILD_PLATFORM ]]; then
+   DOCKER_BUILD_FLAGS=""
+   declare -r USABILLA_TAG_SUFFIX=""
+else
+   DOCKER_BUILD_FLAGS="--platform="${DOCKER_BUILD_PLATFORM}""
+   declare -r USABILLA_TAG_SUFFIX="-$(echo "${DOCKER_BUILD_PLATFORM}" | cut -d "/" -f 2)"
+fi
+declare -r USABILLA_TAG="usabillabv/php:${VERSION_PHP}-${IMAGE}-alpine${VERSION_ALPINE}${USABILLA_TAG_SUFFIX}"
 declare -r USABILLA_TAG_DEV="${USABILLA_TAG}-dev"
 
-declare -r TAG_FILE="./tmp/build-${IMAGE}.tags"
+declare -r TAG_FILE="./tmp/build-${IMAGE}${USABILLA_TAG_SUFFIX}.tags"
 
-sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG}" --target="${IMAGE}" -f - . \
+sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG}" --target="${IMAGE}" ${DOCKER_BUILD_FLAGS} -f - . \
     && echo "$USABILLA_TAG" >> "$TAG_FILE"
 
-sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG_DEV}" --target="${IMAGE}-dev" -f - . \
+sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${IMAGE}" | docker build --pull -t "${USABILLA_TAG_DEV}" --target="${IMAGE}-dev" ${DOCKER_BUILD_FLAGS} -f - . \
     && echo "$USABILLA_TAG_DEV" >> "$TAG_FILE"

build-php.sh

@@ -17,16 +17,23 @@ declare -r IMAGE_ORIGINAL_TAG="nginx:1.[0-9][0-9]?-alpine"
 
 declare -r IMAGE_TAG="nginx:${VERSION_NGINX}-alpine"
 declare -r USABILLA_TAG_PREFIX="usabillabv/php"
-declare -r USABILLA_TAG="${USABILLA_TAG_PREFIX}:${IMAGE}"
+if [[ ! -v DOCKER_BUILD_PLATFORM ]]; then
+   DOCKER_BUILD_FLAGS=""
+   declare -r USABILLA_TAG_SUFFIX=""
+else
+   DOCKER_BUILD_FLAGS="--platform="${DOCKER_BUILD_PLATFORM}""
+   declare -r USABILLA_TAG_SUFFIX="-$(echo "${DOCKER_BUILD_PLATFORM}" | cut -d "/" -f 2)"
+fi
+declare -r USABILLA_TAG="${USABILLA_TAG_PREFIX}:${IMAGE}${USABILLA_TAG_SUFFIX}"
 
-TAG_FILE="./tmp/build-${IMAGE}.tags"
+TAG_FILE="./tmp/build-${IMAGE}${USABILLA_TAG_SUFFIX}.tags"
 
 sed -E "s/${IMAGE_ORIGINAL_TAG}/${IMAGE_TAG}/g" "Dockerfile-${DOCKER_FILE}" | docker build --pull -t "${USABILLA_TAG}" \
-    --build-arg=NGINX_VHOST_TEMPLATE=prometheus-exporter-file --target="http" -f - . \
+    --build-arg=NGINX_VHOST_TEMPLATE=prometheus-exporter-file --target="http" ${DOCKER_BUILD_FLAGS} -f - . \
     && echo "${USABILLA_TAG}" >> "${TAG_FILE}"
 
 for USABILLA_TAG_EXTRA in "${@:2}"
 do
-    docker tag "${USABILLA_TAG}" "${USABILLA_TAG_PREFIX}:${USABILLA_TAG_EXTRA}" \
-    && echo "${USABILLA_TAG_PREFIX}:${USABILLA_TAG_EXTRA}" >> "${TAG_FILE}"
+    docker tag "${USABILLA_TAG}" "${USABILLA_TAG_PREFIX}:${USABILLA_TAG_EXTRA}${USABILLA_TAG_SUFFIX}" \
+    && echo "${USABILLA_TAG_PREFIX}:${USABILLA_TAG_EXTRA}${USABILLA_TAG_SUFFIX}" >> "${TAG_FILE}"
 done

build-prometheus-exporter-file.sh

@@ -4,7 +4,7 @@ set -xeu
 
 VERSION="1.2.2"
 
-curl -sL -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v"$VERSION"/dumb-init_"$VERSION"_amd64
+curl -sL -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v"$VERSION"/dumb-init_"$VERSION"_"${TARGETARCH}"
 
 chmod +x /usr/local/bin/dumb-init
 

src/php/utils/install-dumb-init

@@ -2,9 +2,9 @@
 
 set -xe
 
-curl -sL -o /usr/local/bin/shush https://github.com/realestate-com-au/shush/releases/download/v1.5.0/shush_linux_amd64
+curl -sL -o /usr/local/bin/shush "https://github.com/realestate-com-au/shush/releases/download/v1.5.0/shush_linux_${TARGETARCH}"
 
-echo "cdec941dc5f45dda2d981169aa1845540d2c5bf98bfd1d8a85deaa6a6a43a4d1  /usr/local/bin/shush" | sha256sum -c
+(echo "cdec941dc5f45dda2d981169aa1845540d2c5bf98bfd1d8a85deaa6a6a43a4d1  /usr/local/bin/shush" | sha256sum -c) || (echo "4bc0eecb363008a006e071715f7dd7d30e1be23590d778c1779be889439890c0  /usr/local/bin/shush" | sha256sum -c)
 
 chmod +x /usr/local/bin/shush