Merge pull request #253 from derhuerst/docker-arm64

CI: build & publish linux/arm64 images
entur · Jul 29, 2024 · bdf2320 · bdf2320
2 parents 2e2b1f6 + 245bf38
commit bdf2320
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,4 +59,8 @@ jobs:
       - name: Build container image with Jib, push to container repo
         run: |
           image_date=`date +%Y-%m-%dT%H-%M`
-          mvn --batch-mode compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_date -Dmaven.test.skip -P prettierSkip
+          mvn --batch-mode compile \
+            com.google.cloud.tools:jib-maven-plugin:build \
+            -Djib.to.tags=latest,"$image_date" \
+            -Dmaven.test.skip \
+            -P prettierSkip
diff --git a/pom.xml b/pom.xml
@@ -299,7 +299,17 @@
                 </dependencies>
                 <configuration>
                     <from>
-                        <image>eclipse-temurin:21.0.1_12-jdk-alpine</image>
+                        <image>eclipse-temurin:21.0.1_12-jre</image>
+                        <platforms>
+                            <platform>
+                                <architecture>amd64</architecture>
+                                <os>linux</os>
+                            </platform>
+                            <platform>
+                                <architecture>arm64</architecture>
+                                <os>linux</os>
+                            </platform>
+                        </platforms>
                     </from>
                     <to>
                         <image>${env.CONTAINER_REPO}</image>