test: Add support for multi-arch docker images (letsencrypt#5837)

beautifulentropy · web-flow · commit 65ed9c797419 · 2021-12-08T10:51:01.000-08:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   boulder:
-    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-10-22}
+    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-12-08}
     environment:
       FAKE_DNS: 10.77.77.77
       BOULDER_CONFIG_DIR: test/config
diff --git a/test/boulder-tools/Dockerfile b/test/boulder-tools/Dockerfile
@@ -1,13 +1,18 @@
 FROM buildpack-deps:focal-scm
 ARG GO_VERSION
 
+# Provided automatically by docker buildx.
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # Copied from https://github.com/docker-library/golang/blob/master/Dockerfile-debian.template
 ENV GOPATH /go
+ENV GOARCH=$TARGETARCH
 ENV PATH $GOPATH/bin:/usr/local/go/bin:/usr/local/protoc/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 WORKDIR $GOPATH
 
-RUN wget -O go.tgz "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" && tar -C /usr/local -xzf go.tgz && rm go.tgz;
+RUN arch=$(echo $TARGETPLATFORM | sed 's|\/|-|') && wget -O go.tgz "https://dl.google.com/go/go${GO_VERSION}.${arch}.tar.gz" && tar -C /usr/local -xzf go.tgz && rm go.tgz;
 COPY requirements.txt /tmp/requirements.txt
 COPY boulder.rsyslog.conf /etc/rsyslog.d/
 COPY build.sh /tmp/build.sh
diff --git a/test/boulder-tools/build.sh b/test/boulder-tools/build.sh
@@ -24,7 +24,13 @@ apt-get install -y --no-install-recommends \
   autoconf \
   automake
 
-curl -L https://github.com/google/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip -o /tmp/protoc.zip
+PROTO_ARCH=x86_64
+if [ "${GOARCH}" = arm64 ]
+then
+  PROTO_ARCH=aarch_64
+fi
+
+curl -L https://github.com/google/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-"${PROTO_ARCH}".zip -o /tmp/protoc.zip
 unzip /tmp/protoc.zip -d /usr/local/protoc
 
 # Override default GOBIN and GOCACHE
diff --git a/test/boulder-tools/tag_and_upload.sh b/test/boulder-tools/tag_and_upload.sh
@@ -7,29 +7,25 @@ DOCKER_REPO="letsencrypt/boulder-tools"
 
 GO_VERSIONS=( "1.17" )
 
-# Build a tagged image for each GO_VERSION
-for GO_VERSION in "${GO_VERSIONS[@]}"
-do
-  TAG_NAME="$DOCKER_REPO:go${GO_VERSION}_${DATESTAMP}"
-  echo "Building boulder-tools image $TAG_NAME"
-
-  # Build the docker image using the templated Dockerfile, tagging it with
-  # TAG_NAME
-  docker build . \
-    -t $TAG_NAME \
-    --build-arg "GO_VERSION=${GO_VERSION}"
-done
-
-# Log in once now that images are ready to upload
-echo "Images ready, please login to allow Dockerhub push"
+echo "Please login to allow push to DockerHub"
 docker login
 
-# Upload a tagged image for each GO_VERSION
+# Build and push a tagged image for each GO_VERSION.
 for GO_VERSION in "${GO_VERSIONS[@]}"
 do
-  TAG_NAME="$DOCKER_REPO:go${GO_VERSION}_${DATESTAMP}"
-  echo "Pushing ${TAG_NAME} to Dockerhub"
-  docker push ${TAG_NAME}
+  TAG_NAME="${DOCKER_REPO}:go${GO_VERSION}_${DATESTAMP}"
+  echo "Building boulder-tools image ${TAG_NAME}"
+  
+  # create a docker buildx node for cross-compilation.
+  docker buildx create --use --name=cross
+  
+  # build, tag, and push the image.
+  docker buildx build --build-arg "GO_VERSION=${GO_VERSION}" \
+    --push --tag "${TAG_NAME}" \
+    --platform=linux/amd64,linux/arm64 .
+  
+  # delete the docker buildx node.
+  docker buildx rm cross
 done
 
 # TODO(@cpu): Figure out a `sed` for updating the date in `docker-compose.yml`'s
