gha: remove external base image dependency

Author: rmanaloto-tastytrade

.devcontainer/Dockerfile

@@ -46,7 +46,6 @@ ARG JQ_SHA256=020468de7539ce70ef1bceaf7cde2e8c4f2ca6c3afb84642aabc5c97d9fc2a0d
 ARG AWSCLI_VERSION=latest
 ARG EGET_VERSION=v1.3.4
 ARG MUTAGEN_VERSION=v0.18.1
-ARG BASE_IMAGE=ghcr.io/rmanaloto-tastytrade/cpp-devcontainers/cpp-dev-base:local
 ARG ENABLE_VALGRIND=1
 ARG ENABLE_CPPCHECK=1
 ARG ENABLE_IWYU=1
@@ -263,7 +262,7 @@ RUN set -e; \
 
 # ---------- Parallel builders (FROM base) ----------
 
-FROM ${BASE_IMAGE} AS prebuilt_base
+FROM base AS prebuilt_base
 
 FROM prebuilt_base AS clang_p2996
 ARG CLANG_P2996_BRANCH

.devcontainer/docker-bake.hcl

@@ -94,7 +94,6 @@ target "_base" {
     USERNAME           = "slotmap"
     USER_UID           = "1000"
     USER_GID           = "1000"
-    BASE_IMAGE         = "${BASE_TAG}"
     VCPKG_ROOT         = "/opt/vcpkg"
     VCPKG_DOWNLOADS    = "/opt/vcpkg/downloads"
     MRDOCS_VERSION     = "v0.8.0"

.github/workflows/build-devcontainer.yml

@@ -15,7 +15,6 @@ env:
   DOCKER_BUILDKIT: 1
   BUILDX_NO_DEFAULT_LOAD: 1
   TAG_BASE: ghcr.io/${{ github.repository }}/devcontainer
-  BASE_IMAGE_TAG: cpp-dev-base:local
   BASE_CACHE_TAG: ghcr.io/${{ github.repository }}/cpp-dev-base:cache
   SUMMARY_JSON: devcontainer-summary.json
   EXPECTED_RUNNER_NAME: c0802s4-000
@@ -190,15 +189,11 @@ jobs:
 
       - name: Guard against docker.io fallback
         run: |
-          case "${BASE_IMAGE_TAG}" in
-            ghcr.io/*|localhost/*|cpp-dev-base:local) ;;
-            *) echo "BASE_IMAGE_TAG must be ghcr.io/* or localhost/*, got ${BASE_IMAGE_TAG}"; exit 1 ;;
-          esac
           case "${BASE_CACHE_TAG}" in
             ghcr.io/*) ;;
             *) echo "BASE_CACHE_TAG must be ghcr.io/*, got ${BASE_CACHE_TAG}"; exit 1 ;;
           esac
-          BASE_TAG=${{ env.BASE_IMAGE_TAG }} BASE_CACHE_TAG=${{ env.BASE_CACHE_TAG }} \
+          BASE_CACHE_TAG=${{ env.BASE_CACHE_TAG }} \
             docker buildx bake --file .devcontainer/docker-bake.hcl --print base > /tmp/bake-print.txt
           if grep -Ei "docker\\.io|library/" /tmp/bake-print.txt; then
             echo "docker.io reference detected in base bake plan"
@@ -209,7 +204,7 @@ jobs:
             exit 1
           fi
           for tgt in devcontainer_gcc14_clang_qual devcontainer_gcc14_clang_dev devcontainer_gcc14_clangp2996 devcontainer_gcc15_clang_qual devcontainer_gcc15_clang_dev devcontainer_gcc15_clangp2996; do
-            BASE_TAG=${{ env.BASE_IMAGE_TAG }} BASE_CACHE_TAG=${{ env.BASE_CACHE_TAG }} \
+            BASE_CACHE_TAG=${{ env.BASE_CACHE_TAG }} \
               docker buildx bake --file .devcontainer/docker-bake.hcl --print "$tgt" > "/tmp/bake-${tgt}.txt"
             if grep -Ei "docker\\.io|library/" "/tmp/bake-${tgt}.txt"; then
               echo "docker.io reference detected in permutation bake plan ($tgt)"
@@ -238,12 +233,6 @@ jobs:
           set: |
             base.cache-from=type=registry,ref=${{ env.BASE_CACHE_TAG }}
             base.cache-to=type=registry,ref=${{ env.BASE_CACHE_TAG }},mode=max,compression=zstd,oci-mediatypes=true,force-compression=true
-            devcontainer_gcc14_clang_qual.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
-            devcontainer_gcc14_clang_dev.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
-            devcontainer_gcc14_clangp2996.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
-            devcontainer_gcc15_clang_qual.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
-            devcontainer_gcc15_clang_dev.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
-            devcontainer_gcc15_clangp2996.args.BASE_IMAGE=${{ env.BASE_IMAGE_TAG }}
             devcontainer_gcc14_clang_qual.cache-from=type=registry,ref=${{ env.BASE_CACHE_TAG }}
             devcontainer_gcc14_clang_dev.cache-from=type=registry,ref=${{ env.BASE_CACHE_TAG }}
             devcontainer_gcc14_clangp2996.cache-from=type=registry,ref=${{ env.BASE_CACHE_TAG }}

scripts/ci_bake_smoke.sh

@@ -8,34 +8,20 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "${ROOT}"
 
 TAG_BASE="${TAG_BASE:-ghcr.io/rmanaloto-tastytrade/cpp-devcontainers/devcontainer}"
-# Use localhost tag locally so we don't require a registry pull between steps.
-BASE_IMAGE_TAG="${BASE_IMAGE_TAG:-localhost/cpp-dev-base:local}"
 BASE_CACHE_TAG="${BASE_CACHE_TAG:-ghcr.io/rmanaloto-tastytrade/cpp-devcontainers/cpp-dev-base:cache}"
-
-case "${BASE_IMAGE_TAG}" in
-  ghcr.io/*|localhost/*|cpp-dev-base:local) ;;
-  *) echo "BASE_IMAGE_TAG must point at ghcr.io/* or localhost/* (got ${BASE_IMAGE_TAG})" >&2; exit 1 ;;
-esac
 case "${BASE_CACHE_TAG}" in
   ghcr.io/*) ;;
   *) echo "BASE_CACHE_TAG must point at ghcr.io (got ${BASE_CACHE_TAG})" >&2; exit 1 ;;
 esac
 
 echo "Running bake smoke test with:"
 echo "  TAG_BASE=${TAG_BASE}"
-echo "  BASE_IMAGE_TAG=${BASE_IMAGE_TAG}"
 echo "  BASE_CACHE_TAG=${BASE_CACHE_TAG}"
 
 docker buildx bake \
   --file .devcontainer/docker-bake.hcl \
   --set base.cache-from="type=registry,ref=${BASE_CACHE_TAG}" \
   --set base.cache-to="type=registry,ref=${BASE_CACHE_TAG},mode=max,compression=zstd,oci-mediatypes=true,force-compression=true" \
-  --set devcontainer_gcc14_clang_qual.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
-  --set devcontainer_gcc14_clang_dev.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
-  --set devcontainer_gcc14_clangp2996.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
-  --set devcontainer_gcc15_clang_qual.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
-  --set devcontainer_gcc15_clang_dev.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
-  --set devcontainer_gcc15_clangp2996.args.BASE_IMAGE="${BASE_IMAGE_TAG}" \
   --set devcontainer_gcc14_clang_qual.cache-from="type=registry,ref=${BASE_CACHE_TAG}" \
   --set devcontainer_gcc14_clang_dev.cache-from="type=registry,ref=${BASE_CACHE_TAG}" \
   --set devcontainer_gcc14_clangp2996.cache-from="type=registry,ref=${BASE_CACHE_TAG}" \