From 1f6992cc5c80ca8239b528f3bdd41790f183a160 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Sat, 13 Jan 2024 08:29:59 +0100
Subject: [PATCH] Set correct tag for building docker images

---
 build/build.sh               | 3 +++
 build/tmp.patch              | 2 +-
 dev/versions                 | 1 -
 patches/docker-compose.patch | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 4d0d821..933a5a5 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -26,6 +26,9 @@ if [ "$BUILD_IMAGE" == "" ]; then
     BUILD_IMAGE=$(eval echo $(grep boulder-tools $TMP_DIR/src/docker-compose.yml | grep "image:" | head -1 | sed -e "s/image://" | sed -e "s/&boulder_image//"))
 fi
 
+BOULDER_TOOLS_TAG=$(grep go1. $TMP_DIR/src/.github/workflows/boulder-ci.yml | head -1 | sed -e "s/\s*- //")
+BUILD_IMAGE=${BUILD_IMAGE/latest/$BOULDER_TOOLS_TAG}
+
 echo
 $cloneDir/patch.sh
 cp -r test labca
diff --git a/build/tmp.patch b/build/tmp.patch
index a90a78c..af55ba2 100644
--- a/build/tmp.patch
+++ b/build/tmp.patch
@@ -6,7 +6,7 @@ index aeb34b387..16db397ae 100644
      # The `letsencrypt/boulder-tools:latest` tag is automatically built in local
      # dev environments. In CI a specific BOULDER_TOOLS_TAG is passed, and it is
      # pulled with `docker compose pull`.
--    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.5_2023-12-11}
+-    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
 +    image: ghcr.io/hakwerk/labca-boulder:${LABCA_IMAGE_VERSION:-latest}
      build:
        context: test/boulder-tools/
diff --git a/dev/versions b/dev/versions
index b69a576..408dad0 100755
--- a/dev/versions
+++ b/dev/versions
@@ -77,7 +77,6 @@ echo
 
 echo "Boulder CI tag(s):"
 grep go1. ../boulder/.github/workflows/boulder-ci.yml
-colorCITag build/tmp.patch
 colorCITag build/Dockerfile-boulder
 echo
 
diff --git a/patches/docker-compose.patch b/patches/docker-compose.patch
index 537daa5..c32b6b2 100644
--- a/patches/docker-compose.patch
+++ b/patches/docker-compose.patch
@@ -11,7 +11,7 @@ index c580176cd..aeb34b387 100644
      # dev environments. In CI a specific BOULDER_TOOLS_TAG is passed, and it is
      # pulled with `docker compose pull`.
 -    image: letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
-+    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.5_2023-12-11}
++    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
      build:
        context: test/boulder-tools/
        # Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.