From cc6648b017b7e63ed72b2ec56aa4dfd8a48d35bd Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 13 Aug 2020 15:15:32 -0700
Subject: [PATCH] rewrite build step

---
 tools/docker/build.sh               | 81 ++++++++++++++++++++++++-----
 tools/docker/core/hooks/build       |  9 ----
 tools/docker/core/hooks/pre_build   | 10 ----
 tools/docker/lib/common             | 73 --------------------------
 tools/docker/plugin/hooks/build     |  9 ----
 tools/docker/plugin/hooks/pre_build | 10 ----
 6 files changed, 67 insertions(+), 125 deletions(-)
 delete mode 100644 tools/docker/core/hooks/build
 delete mode 100755 tools/docker/core/hooks/pre_build
 delete mode 100644 tools/docker/plugin/hooks/build
 delete mode 100644 tools/docker/plugin/hooks/pre_build

diff --git a/tools/docker/build.sh b/tools/docker/build.sh
index 79617ca84..09627e371 100755
--- a/tools/docker/build.sh
+++ b/tools/docker/build.sh
@@ -38,26 +38,79 @@ Cleanup() {
     done
 }
 
-Build() {
-    DOCKER_REPO="$1"
-    TAG_BASE="$2"
-    CONTEXT_PATH="$3"
-    DOCKERFILE_DIR="$4"
-    DOCKERFILE_PATH="$DOCKERFILE_DIR/Dockerfile"
-    pushd "$CONTEXT_PATH"
-        DOCKER_TAG="$TAG_BASE" DOCKER_REPO="$DOCKER_REPO" DOCKERFILE_PATH="$DOCKERFILE_PATH" bash "$DOCKERFILE_DIR/hooks/pre_build"
-        DOCKER_TAG="$TAG_BASE" DOCKER_REPO="$DOCKER_REPO" DOCKERFILE_PATH="$DOCKERFILE_PATH" bash "$DOCKERFILE_DIR/hooks/build"
-    popd
+# Returns the translation from Docker to QEMU architecture
+# Usage: GetQemuArch [amd64|arm32v6|arm64v8]
+GetQemuArch() {
+    ARCH=$1
+
+    case "$ARCH" in
+        "amd64")
+            echo "x86_64"
+            ;;
+        "arm32v6")
+            echo "arm"
+            ;;
+        "arm64v8")
+            echo "aarch64"
+            ;;
+        "*")
+            echo "Not supported build architecture '$1'." >&2
+            exit -1
+    esac
+}
+
+# Downloads QEMU static binary file for architecture
+# Usage: DownloadQemuStatic [x86_64|arm|aarch64]
+DownloadQemuStatic() {
+    ARCH=$1
+
+    QEMU_ARCH=$(GetQemuArch "$ARCH")
+    if [ ! -f "qemu-${QEMU_ARCH}-static" ]; then
+        QEMU_DOWNLOAD_URL="https://github.com/multiarch/qemu-user-static/releases/download"
+        QEMU_LATEST_TAG=$(curl -s https://api.github.com/repos/multiarch/qemu-user-static/tags \
+            | grep 'name.*v[0-9]' \
+            | head -n 1 \
+            | cut -d '"' -f 4)
+        curl -SL "${QEMU_DOWNLOAD_URL}/${QEMU_LATEST_TAG}/x86_64_qemu-$QEMU_ARCH-static.tar.gz" \
+            | tar xzv
+    fi
 }
 
 TAG_BASE="$1"
 
+# Register QEMU handlers
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
 # Step 1: Certbot core Docker
-Build "$DOCKER_HUB_ORG/certbot" "$TAG_BASE" "$REPO_ROOT" "$WORK_DIR/core"
+DOCKER_REPO="${DOCKER_HUB_ORG}/certbot"
+for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
+    pushd "${REPO_ROOT}"
+    DownloadQemuStatic "${TARGET_ARCH}"
+    QEMU_ARCH=$(GetQemuArch "${TARGET_ARCH}")
+    docker build \
+        --build-arg TARGET_ARCH="${TARGET_ARCH}" \
+        --build-arg QEMU_ARCH="${QEMU_ARCH}" \
+        -f "${WORK_DIR}/core/Dockerfile" \
+        -t "${DOCKER_REPO}:${TARGET_ARCH}-${TAG_BASE}" \
+        .
+    popd
+done
 
 # Step 2: Certbot DNS plugins Docker images
 for plugin in "${CERTBOT_PLUGINS[@]}"; do
-    Build "$DOCKER_HUB_ORG/$plugin" "$TAG_BASE" "$REPO_ROOT/certbot-$plugin" "$WORK_DIR/plugin"
+    DOCKER_REPO="${DOCKER_HUB_ORG}/${plugin}"
+    pushd "${REPO_ROOT}/certbot-${plugin}"
+    # Copy QEMU static binaries downloaded when building the core Certbot image
+    cp ../qemu-*-static .
+    for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
+        QEMU_ARCH=$(GetQemuArch "${TARGET_ARCH}")
+        BASE_IMAGE="${DOCKER_HUB_ORG}/certbot:${TARGET_ARCH}-${TAG_BASE}"
+        docker build \
+            --build-arg BASE_IMAGE="${BASE_IMAGE}" \
+            --build-arg QEMU_ARCH="${QEMU_ARCH}" \
+            -f "${WORK_DIR}/plugin/Dockerfile" \
+            -t "${DOCKER_REPO}:${ARCH}-${TAG_BASE}" \
+            .
+    done
+    popd
 done
-
-Cleanup
diff --git a/tools/docker/core/hooks/build b/tools/docker/core/hooks/build
deleted file mode 100644
index 4925dc269..000000000
--- a/tools/docker/core/hooks/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -ex
-
-WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source "$WORK_DIR/../../lib/common"
-
-for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
-    BuildDockerCoreImage "${TARGET_ARCH}"
-done
diff --git a/tools/docker/core/hooks/pre_build b/tools/docker/core/hooks/pre_build
deleted file mode 100755
index 723e35161..000000000
--- a/tools/docker/core/hooks/pre_build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-
-WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source "$WORK_DIR/../../lib/common"
-
-RegisterQemuHandlers
-for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
-    DownloadQemuStatic "${TARGET_ARCH}"
-done
diff --git a/tools/docker/lib/common b/tools/docker/lib/common
index 0654da54b..e14ab546a 100644
--- a/tools/docker/lib/common
+++ b/tools/docker/lib/common
@@ -32,79 +32,6 @@ export CERTBOT_PLUGINS=(
     "dns-sakuracloud"
 )
 
-# Returns the translation from Docker to QEMU architecture
-# Usage: GetQemuArch [amd64|arm32v6|arm64v8]
-GetQemuArch() {
-    ARCH=$1
-
-    case "$ARCH" in
-        "amd64")
-            echo "x86_64"
-            ;;
-        "arm32v6")
-            echo "arm"
-            ;;
-        "arm64v8")
-            echo "aarch64"
-            ;;
-        "*")
-            echo "Not supported build architecture '$1'." >&2
-            exit -1
-    esac
-}
-
-# Downloads QEMU static binary file for architecture
-# Usage: DownloadQemuStatic [x86_64|arm|aarch64]
-DownloadQemuStatic() {
-    ARCH=$1
-
-    QEMU_ARCH=$(GetQemuArch "$ARCH")
-    if [ ! -f "qemu-${QEMU_ARCH}-static" ]; then
-        QEMU_DOWNLOAD_URL="https://github.com/multiarch/qemu-user-static/releases/download"
-        QEMU_LATEST_TAG=$(curl -s https://api.github.com/repos/multiarch/qemu-user-static/tags \
-            | grep 'name.*v[0-9]' \
-            | head -n 1 \
-            | cut -d '"' -f 4)
-        curl -SL "${QEMU_DOWNLOAD_URL}/${QEMU_LATEST_TAG}/x86_64_qemu-$QEMU_ARCH-static.tar.gz" \
-            | tar xzv
-    fi
-}
-
-# Executes the QEMU register script
-# Usage: RegisterQemuHandlers
-RegisterQemuHandlers() {
-    docker run --rm --privileged multiarch/qemu-user-static:register --reset
-}
-
-# Builds docker certbot core image for a specific architecture.
-# Usage: BuildDockerCoreImage [amd64|arm32v6|arm64v8]
-BuildDockerCoreImage() {
-    ARCH=$1
-
-    QEMU=$(GetQemuArch "$ARCH")
-    docker build \
-        --build-arg TARGET_ARCH="${ARCH}" \
-        --build-arg QEMU_ARCH="${QEMU}" \
-        -f "${DOCKERFILE_PATH}" \
-        -t "${DOCKER_REPO}:${ARCH}-${DOCKER_TAG}" \
-        .
-}
-
-# Builds docker certbot plugin image for a specific architecture and tag.
-# Usage: BuildDockerPluginImage [amd64|arm32v6|arm64v8]
-BuildDockerPluginImage() {
-    ARCH=$1
-
-    QEMU=$(GetQemuArch "$ARCH")
-    BASE_IMAGE="${DOCKER_HUB_ORG}/certbot:${TARGET_ARCH}-${DOCKER_TAG}"
-    docker build \
-        --build-arg BASE_IMAGE="${BASE_IMAGE}" \
-        --build-arg QEMU_ARCH="${QEMU}" \
-        -f "${DOCKERFILE_PATH}" \
-        -t "${DOCKER_REPO}:${ARCH}-${DOCKER_TAG}" \
-        .
-}
-
 # Pushes docker image for a specific architecture.
 # Usage: BuildDockerCoreImage [amd64|arm32v6|arm64v8]
 PushDockerImage() {
diff --git a/tools/docker/plugin/hooks/build b/tools/docker/plugin/hooks/build
deleted file mode 100644
index 684be6951..000000000
--- a/tools/docker/plugin/hooks/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -ex
-
-WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source "$WORK_DIR/../../lib/common"
-
-for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
-    BuildDockerPluginImage "${TARGET_ARCH}"
-done
diff --git a/tools/docker/plugin/hooks/pre_build b/tools/docker/plugin/hooks/pre_build
deleted file mode 100644
index 723e35161..000000000
--- a/tools/docker/plugin/hooks/pre_build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-
-WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source "$WORK_DIR/../../lib/common"
-
-RegisterQemuHandlers
-for TARGET_ARCH in "${ALL_TARGET_ARCH[@]}"; do
-    DownloadQemuStatic "${TARGET_ARCH}"
-done