Merge pull request 'Build on container-base almalinux9 0.1.3' (#5) from container-base-0-1-3 into main

Reviewed-on: #5

.woodpecker/docker.yaml

@@ -36,28 +36,27 @@ steps:
             memory: 4Gi
             cpu: 2
 
-  # The default distro also carries the unsuffixed tags.
+  # The default distro's unsuffixed tag is an alias of the image the step above just
-  - name: docker-default
+  # pushed, not a second build of it: imagetools create only writes a new tag reference
+  # to the existing manifest, so :<version> and :<version>-<suffix> are one digest. No
+  # daemon is involved; the internal CA is baked into this image at /etc/docker/certs.d/.
+  - name: docker-default-tag
     image: "artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest"
     when:
       - evaluate: 'DEFAULT == "true"'
-    settings:
+    environment:
-      registry: artifactapi.k8s.syd1.au.unkin.net
+      REPO: "artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder"
-      repo: "artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder"
+      VERSION: "${CI_COMMIT_TAG##v}"
-      target: image
+      SUFFIX: "${TAG_SUFFIX}"
-      build_args:
+    commands:
-        BASE_IMAGE_NAME: "${BASE_IMAGE_NAME}"
+      - 'docker buildx imagetools create -t "$REPO:$VERSION" "$REPO:$VERSION-$SUFFIX"'
-        DISTRO: "${DISTRO}"
-      tags:
-        - "${CI_COMMIT_TAG##v}"
-        - latest
     backend_options:
       kubernetes:
         serviceAccountName: default
         resources:
           requests:
-            memory: 1Gi
+            memory: 256Mi
-            cpu: 1
+            cpu: 250m
           limits:
-            memory: 4Gi
+            memory: 512Mi
-            cpu: 2
+            cpu: 500m

.woodpecker/pre-commit.yaml

@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: pre-commit
-    image: "git.unkin.net/unkin/almalinux9-gobuilder:20260606"
+    image: "artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.0-alma9"
     commands:
       - uvx pre-commit run --all-files
     backend_options:

Dockerfile

@@ -1,6 +1,6 @@
 ARG REGISTRY=artifactapi.k8s.syd1.au.unkin.net/docker-internal
 # The container-base release this image is built on — the one place to bump it.
-ARG BASE_VERSION=0.1.0
+ARG BASE_VERSION=0.1.3
 ARG BASE_IMAGE_NAME=almalinux9
 
 FROM ${REGISTRY}/${BASE_IMAGE_NAME}:${BASE_VERSION} AS image

README.md

@@ -2,7 +2,8 @@
 
 The estate's Go toolchain image, built on each `container-base` distro image.
 Published as `artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:<version>-<suffix>`;
-the default distro also gets the unsuffixed `:<version>` and `:latest`.
+the default distro's build is retagged as the unsuffixed `:<version>`, so both resolve
+to one digest. Only explicit versions are published; never a floating tag.
 
 | distro | from | tag suffix | default |
 | --- | --- | --- | --- |

ci/check-distros.sh

@@ -36,7 +36,7 @@ EOF
   done
 done
 
-# Exactly one distro owns the unsuffixed :<version> and :latest tags.
+# Exactly one distro owns the unsuffixed :<version> tag.
 defaults=$(grep -l 'DEFAULT="true"' distros/*/distro.env | wc -l)
 [ "$defaults" -eq 1 ] || { echo "expected exactly one distro with DEFAULT=\"true\", found ${defaults}"; fail=1; }
 

distros/alma9/distro.env

@@ -2,7 +2,7 @@
 BASE_IMAGE_NAME="almalinux9"
 IMAGE="gobuilder"
 TAG_SUFFIX="alma9"
-# The default distro also gets the unsuffixed :<version> and :latest tags.
+# The default distro also gets the unsuffixed :<version> tag.
 DEFAULT="true"
 
 # Estate local repo used to prove inherited HTTPS trust.