From e46d26a7c4c52d153c35b8e0d50a48de04f87374 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Fri, 19 Jul 2019 16:32:49 -0700 Subject: [PATCH] First stab at multi-arch builds --- Dockerfile | 3 ++- hooks/build | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d7a62b..2a8dc27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM haproxy:1.9-alpine +ARG REPO=library +FROM ${REPO}/haproxy:1.9-alpine EXPOSE 2375 ENV ALLOW_RESTARTS=0 \ diff --git a/hooks/build b/hooks/build index 1fb6367..74d13a4 100755 --- a/hooks/build +++ b/hooks/build @@ -1,7 +1,40 @@ #!/bin/bash set -ex +# Extract arch repo from a docker tag suffix +REPO="" +case "$DOCKER_TAG" in + *amd64) + REPO="library" + ;; + *arm32v5) + REPO="arm32v5" + ;; + *arm32v6) + REPO="arm32v6" + ;; + *arm32v7) + REPO="arm32v7" + ;; + *arm64v8) + REPO="arm64v8" + ;; + *i386) + REPO="i386" + ;; + *ppc64le) + REPO="ppc64le" + ;; + *s390x) + REPO="s390x" + ;; + *) + REPO="library" + ;; +esac + docker build \ + --build-arg REPO="$REPO" \ --build-arg VCS_REF="$GIT_SHA1" \ --build-arg BUILD_DATE="$(date --rfc-3339 ns)" \ --tag "$IMAGE_NAME" .