Use only 8, 11, 16 (and OpenJ9 variants)

2021-07-04 14:56:00 -07:00
parent 85a16a07c2
commit b5747f2fa2
7 changed files with 10 additions and 10 deletions
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -15,12 +15,12 @@ jobs:
      fail-fast: false
      matrix:
        tag:
-          - 7
          - 8
-          - 9
+          - 8j9
          - 11
-          - 14
+          - 11j9
          - 16
+          - 16j9
    steps:
      - uses: actions/checkout@v2
      - uses: docker/setup-buildx-action@v1
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"

--- a/java/11j9/Dockerfile
+++ b/java/11j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk9:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"

--- a/java/16/Dockerfile
+++ b/java/16/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"

--- a/java/16j9/Dockerfile
+++ b/java/16j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM openjdk:7-jre-alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"

--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM ibmjava:8-jre-alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"

--- a/java/8j9/Dockerfile
+++ b/java/8j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #

-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk14:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:alpine-jre

 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"