More changes

Author: ekilmer

.github/workflows/vcpkg_docker.yml

@@ -1,5 +1,7 @@
 name: Docker Build Images
 
+# Based on https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
+
 on:
   schedule:
     # Once every Wednesday at 00:00
@@ -9,11 +11,11 @@ on:
       - master
     paths:
       - 'docker/**'
-      - '.github/workflows/vcpkg_docker_amd64.yml'
+      - '.github/workflows/vcpkg_docker.yml'
   pull_request:
     paths:
       - 'docker/**'
-      - '.github/workflows/vcpkg_docker_amd64.yml'
+      - '.github/workflows/vcpkg_docker.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -29,8 +31,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container:
-          - { version: '22.04', codename: 'jammy' }
         platform:
           - linux/amd64
           - linux/arm64
@@ -49,8 +49,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to GitHub registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate Image Name
         env:
@@ -112,8 +116,12 @@ jobs:
         with:
           images: ${{ env.REGISTRY_IMAGE }}
 
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests

docker/Dockerfile.ubuntu.vcpkg

@@ -1,4 +1,4 @@
-ARG DISTRO_VERSION=focal
+ARG DISTRO_VERSION=jammy
 ARG LLVM_VERSION=16
 
 ARG BUILD_BASE=ubuntu:${DISTRO_VERSION}
@@ -47,10 +47,8 @@ ARG DISTRO_VERSION
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     \
-    if [ ${DISTRO_VERSION} != "jammy" ] ; then \
-        apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-        echo "deb https://download.mono-project.com/repo/ubuntu stable-${DISTRO_VERSION} main" | tee /etc/apt/sources.list.d/mono-official-stable.list ; \
-    fi && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+    echo "deb https://download.mono-project.com/repo/ubuntu stable-${DISTRO_VERSION} main" | tee /etc/apt/sources.list.d/mono-official-stable.list ; \
     \
     apt-get update && \
     apt-get install --yes mono-devel && \