From 4a055015f03510753dec448a3982a6623189ef7a Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Tue, 9 Jan 2024 16:16:50 -0500
Subject: [PATCH] Add back "-v2" to image name

Now that we use the original image naming scheme, this needs to be added
back
---
 .github/workflows/vcpkg_docker.yml |  4 ++--
 docker/build.sh                    | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/vcpkg_docker.yml b/.github/workflows/vcpkg_docker.yml
index 349f145c..cba23023 100644
--- a/.github/workflows/vcpkg_docker.yml
+++ b/.github/workflows/vcpkg_docker.yml
@@ -27,7 +27,7 @@ jobs:
     env:
       # This needs to be the same as in the `merge` job
       # Also remember to change the 'docker/build.sh' script
-      REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu
+      REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2
     strategy:
       fail-fast: false
       matrix:
@@ -111,7 +111,7 @@ jobs:
       - build
     env:
       # This needs to be the same as in the `build` job
-      REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu
+      REGISTRY_IMAGE: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2
     strategy:
       fail-fast: false
       matrix:
diff --git a/docker/build.sh b/docker/build.sh
index 5b990608..a5fa45e8 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -8,19 +8,20 @@ set -euo pipefail
 # Ubuntu versions to build
 UBUNTU_VERSION_MATRIX=( "22.04" "24.04" )
 
-for version in "${UBUNTU_VERSION_MATRIX[@]}"; do
+for ubuntu_version in "${UBUNTU_VERSION_MATRIX[@]}"; do
   # Always pull from upstream
-  docker pull "ubuntu:${version}"
+  docker pull "ubuntu:${ubuntu_version}"
 
+  # Image identification. "v2" Image version is to identify big changes to the
+  # build toolchain like LLVM version
   # Also remember to change the '.github/workflows/vcpkg_docker.yml' variable
-  # Image identification
-  image=vcpkg-builder-ubuntu
+  image="vcpkg-builder-ubuntu-v2"
 
   # Build
   docker build \
       -f Dockerfile.ubuntu.vcpkg \
       --no-cache \
-      --build-arg "UBUNTU_VERSION=${version}" \
-      -t "${image}:${version}" \
+      --build-arg "UBUNTU_VERSION=${ubuntu_version}" \
+      -t "${image}:${ubuntu_version}" \
       .
 done