From b6e068cc8fb42e782023e4c070bb69c06700adcf Mon Sep 17 00:00:00 2001 From: William Moses Date: Tue, 17 Feb 2026 09:17:09 -0500 Subject: [PATCH 1/3] Change base image from Ubuntu 24.04 to 22.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 04bc7c5..2a03e1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:24.04 +FROM ubuntu:22.04 # Install packages RUN /bin/sh -c 'export DEBIAN_FRONTEND=noninteractive \ From c4b9855f239c658d2fec2a636cd86922da09053c Mon Sep 17 00:00:00 2001 From: "William S. Moses" Date: Wed, 3 Jun 2026 13:49:58 -0400 Subject: [PATCH 2/3] Multi ubuntu version --- .github/workflows/DockerPublish.yml | 20 ++++++++++++++++++-- Dockerfile | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/DockerPublish.yml b/.github/workflows/DockerPublish.yml index a163d3b..61d4950 100644 --- a/.github/workflows/DockerPublish.yml +++ b/.github/workflows/DockerPublish.yml @@ -42,6 +42,9 @@ jobs: strategy: fail-fast: false matrix: + base: + - 22.04 + - 24.04 include: - platform: 'linux/amd64' os: 'ubuntu-latest' @@ -67,10 +70,14 @@ jobs: platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> "${GITHUB_ENV}" + - name: Set Base + run: | + sed -i "s/VERSION/${{matrix.os}}/g" Dockerfile + # Docker is terrible and doesn't like uppercase image names. - name: Lowercase image name run: | - IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z) + IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.os }} echo "IMAGE_NAME=${IMAGE_NAME}" >> "${GITHUB_ENV}" # Needed to make caching on GHA work: https://stackoverflow.com/a/73884678. @@ -128,6 +135,12 @@ jobs: merge: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + base: + - 22.04 + - 24.04 permissions: contents: read packages: write @@ -139,11 +152,14 @@ jobs: needs: - build steps: + - name: Set Base + run: | + sed -i "s/VERSION/${{matrix.os}}/g" Dockerfile # Docker is terrible and doesn't like uppercase image names. - name: Lowercase image name run: | - IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z) + IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.os }} echo "IMAGE_NAME=${IMAGE_NAME}" >> "${GITHUB_ENV}" - name: Download digests diff --git a/Dockerfile b/Dockerfile index 2a03e1c..5d9c423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:22.04 +FROM ubuntu:VERSION # Install packages RUN /bin/sh -c 'export DEBIAN_FRONTEND=noninteractive \ From b0691ffdbb346789d7e728ab592f4c9f92876243 Mon Sep 17 00:00:00 2001 From: "William S. Moses" Date: Wed, 3 Jun 2026 13:52:25 -0400 Subject: [PATCH 3/3] fix --- .github/workflows/DockerPublish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/DockerPublish.yml b/.github/workflows/DockerPublish.yml index 61d4950..e2a45ec 100644 --- a/.github/workflows/DockerPublish.yml +++ b/.github/workflows/DockerPublish.yml @@ -72,12 +72,12 @@ jobs: - name: Set Base run: | - sed -i "s/VERSION/${{matrix.os}}/g" Dockerfile + sed -i "s/VERSION/${{matrix.base}}/g" Dockerfile # Docker is terrible and doesn't like uppercase image names. - name: Lowercase image name run: | - IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.os }} + IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.base }} echo "IMAGE_NAME=${IMAGE_NAME}" >> "${GITHUB_ENV}" # Needed to make caching on GHA work: https://stackoverflow.com/a/73884678. @@ -154,12 +154,12 @@ jobs: steps: - name: Set Base run: | - sed -i "s/VERSION/${{matrix.os}}/g" Dockerfile + sed -i "s/VERSION/${{matrix.base}}/g" Dockerfile # Docker is terrible and doesn't like uppercase image names. - name: Lowercase image name run: | - IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.os }} + IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.base }} echo "IMAGE_NAME=${IMAGE_NAME}" >> "${GITHUB_ENV}" - name: Download digests