Fix build

antlafarge · Jul 17, 2024 · e400f4f · e400f4f
1 parent d719052
commit e400f4f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/dockerhub-build.yml b/.github/workflows/dockerhub-build.yml
@@ -29,31 +29,30 @@ jobs:
     strategy:
       matrix:
         include:
-          # - name: alpine-openjdk8
-          #   file: alpine.Dockerfile
-          #   openjdk: openjdk8-jre
-          #   platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          # - name: ubuntu-openjdk8
-          #   file: ubuntu.Dockerfile
-          #   openjdk: openjdk-8-jre-headless
-          #   platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          # - name: alpine-openjdk17
-          #   file: alpine.Dockerfile
-          #   openjdk: openjdk17-jre-headless
-          #   platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
+          - name: alpine-openjdk8
+            file: alpine.Dockerfile
+            openjdk: openjdk8-jre
+            platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
+          - name: ubuntu-openjdk8
+            file: ubuntu.Dockerfile
+            openjdk: openjdk-8-jre-headless
+            platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
+          - name: alpine-openjdk17
+            file: alpine.Dockerfile
+            openjdk: openjdk17-jre-headless
+            platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
           - name: ubuntu-openjdk17
             file: ubuntu.Dockerfile
             openjdk: openjdk-17-jre-headless
             platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          # - name: alpine-openjdk21
-          #   file: alpine.Dockerfile
-          #   openjdk: "openjdk21-jre-headless --repository=https://dl-cdn.alpinelinux.org/alpine/v$(cut -d. -f1,2 /etc/alpine-release)/community/"
-          #   platforms: linux/arm64/v8
-            # platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
-          # - name: ubuntu-openjdk21
-          #   file: ubuntu.Dockerfile
-          #   openjdk: openjdk-21-jre-headless
-          #   platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
+          - name: alpine-openjdk21
+            file: alpine.Dockerfile
+            openjdk: openjdk21-jre-headless
+            platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
+          - name: ubuntu-openjdk21
+            file: ubuntu.Dockerfile
+            openjdk: openjdk-21-jre-headless
+            platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU

diff --git a/Dockerfile/alpine.Dockerfile b/Dockerfile/alpine.Dockerfile
@@ -18,7 +18,7 @@ ENV JD_EMAIL="" \
     JAVA_OPTIONS="" \
     UMASK=""
 
-ARG OPENJDK="openjdk21-jre-headless --repository=https://dl-cdn.alpinelinux.org/alpine/v$(cut -d. -f1,2 /etc/alpine-release)/community/"
+ARG OPENJDK="openjdk21-jre-headless"
 
 RUN apk update \
  && apk -U upgrade \
@@ -27,7 +27,7 @@ RUN apk update \
         curl \
         ffmpeg \
         unzip \
-        ${OPENJDK}
+        ${OPENJDK} --repository=https://dl-cdn.alpinelinux.org/alpine/v$(cut -d. -f1,2 /etc/alpine-release)/community/
 
 WORKDIR /jdownloader