Merge pull request #955 from Automattic/multiple-traefiks

feat(traefik): build both v2 and v3
Automattic · Nov 11, 2024 · 7d28c03 · 7d28c03
2 parents 0749f12 + 82da7ef
commit 7d28c03
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/traefik.yml b/.github/workflows/traefik.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   push_to_registry:
-    name: Push Docker image to GitHub Packages
+    name: Build Treafik ${{ matrix.traefik.suffix }} with OpenSSL
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -33,21 +33,30 @@ jobs:
       security-events: write
       id-token: write
       attestations: write
+    strategy:
+      fail-fast: false
+      matrix:
+        traefik:
+          - suffix: "v2"
+            primaryTag: "latest"
+          - suffix: "v3"
+            primaryTag: "v3"
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
 
       - name: Get image version
         id: getversion
-        run: echo "version=$(head -n 1 traefik/Dockerfile | sed -r -e 's/^([^:]+):([^ @$-]+).*/\2/')" >> "${GITHUB_OUTPUT}"
+        run: echo "version=$(head -n 1 "traefik/Dockerfile.${{ matrix.traefik.suffix }}" | sed -r -e 's/^([^:]+):([^ @$-]+).*/\2/')" >> "${GITHUB_OUTPUT}"
 
       - name: Build and push image
         uses: ./.github/actions/build-docker-image
         with:
           context: traefik
+          file: traefik/Dockerfile.${{ matrix.traefik.suffix }}
           push: ${{ github.base_ref == null }}
-          cache-from: type=gha,scope=traefik
-          cache-to: type=gha,mode=max,scope=traefik
+          cache-from: type=gha,scope=traefik-${{ matrix.traefik.suffix }}
+          cache-to: type=gha,mode=max,scope=traefik-${{ matrix.traefik.suffix }}
           no-cache: ${{ github.event_name == 'workflow_dispatch' }}
-          primaryTag: ghcr.io/automattic/vip-container-images/traefik_openssl:${{ steps.getversion.outputs.version }}
-          tags: ghcr.io/automattic/vip-container-images/traefik_openssl:latest
+          primaryTag: ghcr.io/automattic/vip-container-images/traefik_openssl:${{ matrix.traefik.primaryTag }}
+          tags: ghcr.io/automattic/vip-container-images/traefik_openssl:${{ steps.getversion.outputs.version }}
diff --git a/traefik/Dockerfile b/traefik/Dockerfile
diff --git a/traefik/Dockerfile.v2 b/traefik/Dockerfile.v2
@@ -0,0 +1,3 @@
+FROM traefik:2.11.13@sha256:c9769cb5646ff62101899859932183f0da4e9da3ee2be8beebd0ea781584fa23
+
+RUN apk upgrade --no-cache && apk add --no-cache openssl
diff --git a/traefik/Dockerfile.v3 b/traefik/Dockerfile.v3
@@ -0,0 +1,3 @@
+FROM traefik:v3.2.0@sha256:66e37237b371f2b25ce5f247cc371976929dcb18c041e05685f1de1df6422b72
+
+RUN apk upgrade --no-cache && apk add --no-cache openssl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM traefik:2.11.13@sha256:c9769cb5646ff62101899859932183f0da4e9da3ee2be8beebd0ea781584fa23

		RUN apk upgrade --no-cache && apk add --no-cache openssl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM traefik:v3.2.0@sha256:66e37237b371f2b25ce5f247cc371976929dcb18c041e05685f1de1df6422b72

		RUN apk upgrade --no-cache && apk add --no-cache openssl