add ubuntu matrix to build images for multiple base os versions

newrelic · Nov 14, 2024 · eee6cab · eee6cab
1 parent 03274bd
commit eee6cab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/build_publish_builder_image.yaml b/.github/workflows/build_publish_builder_image.yaml
@@ -15,6 +15,7 @@ jobs:
     strategy:
       matrix:
         go-version: [1.22.9, 1.23.2, 1.23.3] # Create a matrix of Go versions to build images for
+        ubuntu-version: [16.04] # Create a matrix of Ubuntu versions to build images for
 
     steps:
       - name: Checkout repository
@@ -43,7 +44,8 @@ jobs:
           file: build/Dockerfile
           build-args: |
             GO_VERSION=${{ matrix.go-version }}
+            UBUNTU_VERSION=${{ matrix.ubuntu-version }}
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ env.VERSION }}-go${{ matrix.go-version }}
-            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest-go${{ matrix.go-version }}
+            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ env.VERSION }}-go${{ matrix.go-version }}-ubuntu${{ matrix.ubuntu-version }}
+            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest-go${{ matrix.go-version }}-ubuntu${{ matrix.ubuntu-version }}
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,11 +1,12 @@
-# Use Ubuntu 16.04 as the base image
-FROM ubuntu:16.04
-
-# Define Go version
+# Arguments
+ARG UBUNTU_VERSION=16.04
 ARG GO_VERSION=1.23.2
 ARG ARCH='amd64'
 ARG GH_VERSION='2.61.0'
 
+# Use Ubuntu as the base image
+FROM ubuntu:${UBUNTU_VERSION}
+
 # Install dependencies
 RUN apt-get update && apt-get install -y \
     gnupg-agent \