Alpine images don't support the arm64, so use the root for that

pufferpanel · Apr 11, 2024 · a16a606 · a16a606
1 parent dbd70ce
commit a16a606
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,6 @@ jobs:
             image: pufferpanel/eclipse-temurin
             tags: |
               type=raw,value=8-alpine
-              type=raw,value=8
             platform: linux/amd64
 
           - path: java/eclipse-temurin
@@ -37,7 +36,6 @@ jobs:
             image: pufferpanel/eclipse-temurin
             tags: |
               type=raw,value=11-alpine
-              type=raw,value=11
             platform: linux/amd64
 
           - path: java/eclipse-temurin
@@ -46,9 +44,32 @@ jobs:
             image: pufferpanel/eclipse-temurin
             tags: |
               type=raw,value=17-alpine
-              type=raw,value=17
             platform: linux/amd64
 
+          - path: java/eclipse-temurin
+            file: ubuntu.Dockerfile
+            arg: JAVA_VERSION=8
+            image: pufferpanel/eclipse-temurin
+            tags: |
+              type=raw,value=8
+              platform: linux/amd64,linux/arm64
+
+          - path: java/eclipse-temurin
+            file: ubuntu.Dockerfile
+            arg: JAVA_VERSION=11
+            image: pufferpanel/eclipse-temurin
+            tags: |
+              type=raw,value=11
+              platform: linux/amd64,linux/arm64
+
+          - path: java/eclipse-temurin
+            file: ubuntu.Dockerfile
+            arg: JAVA_VERSION=17
+            image: pufferpanel/eclipse-temurin
+            tags: |
+              type=raw,value=17
+            platform: linux/amd64,linux/arm64
+
     env:
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
@@ -73,7 +94,7 @@ jobs:
             ${{ matrix.image.tags }}
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build and push Docker image
         id: build-and-push

diff --git a/java/eclipse-temurin/ubuntu.Dockerfile b/java/eclipse-temurin/ubuntu.Dockerfile
@@ -0,0 +1,7 @@
+ARG JAVA_VERSION
+FROM eclipse-temurin:${JAVA_VERSION}
+
+RUN apt update && \
+    apt install -y git && \
+    apt-get clean && \
+    rm -rf /var/cache/apt/archives