Simplify

Author: ekilmer

docker/Dockerfile.ubuntu.vcpkg

@@ -1,9 +1,7 @@
-ARG DISTRO_VERSION=jammy
+ARG UBUNTU_VERSION=22.04
 ARG LLVM_VERSION=16
 
-ARG BUILD_BASE=ubuntu:${DISTRO_VERSION}
-FROM ${BUILD_BASE} as base
-ARG DISTRO_VERSION
+FROM ubuntu:${UBUNTU_VERSION} as base
 ARG LLVM_VERSION
 
 # All build dependencies for vcpkg packages

docker/build.sh

@@ -5,18 +5,16 @@ set -euo pipefail
 # Builds base images with all required dependencies to bootstrap vcpkg and
 # build vcpkg libraries as well as all lifting-bits tools
 
-# Also remember to change the '.github/workflows/vcpkg_docker_amd64.yml' variable
-IMAGE_VER=v2
-
 # Ubuntu versions to build
-UBUNTU_VERSION_MATRIX=( "jammy" )
+UBUNTU_VERSION_MATRIX=( "22.04" )
 
 for version in "${UBUNTU_VERSION_MATRIX[@]}"; do
   # Always pull from upstream
   docker pull "ubuntu:${version}"
 
+  # Also remember to change the '.github/workflows/vcpkg_docker.yml' variable
   # Image identification
-  tag="vcpkg-builder-ubuntu-${IMAGE_VER}:${version}"
+  tag="vcpkg-builder-ubuntu-${version}-v2"
 
   # Build
   docker build \