Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions .github/workflows/DockerPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
strategy:
fail-fast: false
matrix:
base:
- 22.04
- 24.04
include:
- platform: 'linux/amd64'
os: 'ubuntu-latest'
Expand All @@ -67,10 +70,14 @@ jobs:
platform=${{ matrix.platform }}
echo "PLATFORM_PAIR=${platform//\//-}" >> "${GITHUB_ENV}"

- name: Set Base
run: |
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)
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.
Expand Down Expand Up @@ -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
Expand All @@ -139,11 +152,14 @@ jobs:
needs:
- build
steps:
- name: Set Base
run: |
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)
IMAGE_NAME=$(echo ${IMAGE_NAME} | tr A-Z a-z)_${{ matrix.base }}
echo "IMAGE_NAME=${IMAGE_NAME}" >> "${GITHUB_ENV}"

- name: Download digests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM ubuntu:24.04
FROM ubuntu:VERSION

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


# Install packages
RUN /bin/sh -c 'export DEBIAN_FRONTEND=noninteractive \
Expand Down