OpenJDK: Switch to zulu dist + automate install using PPA + Drop JDK …

…14 support
exo-docker · Apr 17, 2024 · 5dee127 · 5dee127
1 parent f2e42b6
commit 5dee127
Show file tree

Hide file tree

Showing 28 changed files with 132 additions and 701 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,13 +28,6 @@ jobs:
           ## Ubuntu 20.04
           - context: openjdk-17/ubuntu/20.04
             imageTag: 17-ubuntu-20,17-ubuntu-2004,openjdk-17-ubuntu-20,openjdk-17-ubuntu-2004
-          # JDK 14
-          ## Ubuntu 22.04
-          - context: openjdk-14/ubuntu/22.04
-            imageTag: 14,14-ubuntu,14-ubuntu-22,14-ubuntu-2204,openjdk-14,openjdk-14-ubuntu,openjdk-14-ubuntu-22,openjdk-14-ubuntu-2204
-          ## Ubuntu 20.04
-          - context: openjdk-14/ubuntu/20.04
-            imageTag: 14-ubuntu-20,14-ubuntu-2004,openjdk-14-ubuntu-20,openjdk-14-ubuntu-2004
           # JDK 11
           ## Ubuntu 22.04
           - context: openjdk-11/ubuntu/22.04

diff --git a/README.md b/README.md
@@ -5,22 +5,20 @@
 
 | JDK version                             | Docker tags                                                                         | Dockerfile                                                                       |
 |-----------------------------------------|----------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
-| openjdk-21 ( 21.0.2 ) + Ubuntu 24.04 | `openjdk-21`, `openjdk-21-ubuntu`, `openjdk-21-ubuntu-24`, `openjdk-21-ubuntu-2404`,`latest`    | *[( openjdk-21/ubuntu/24.04/Dockerfile )](./openjdk-21/ubuntu/24.04/Dockerfile)* |
-| openjdk-21 ( 21.0.2 ) + Ubuntu 22.04 | `openjdk-21-ubuntu-22`, `openjdk-21-ubuntu-2204`                                                | *[( openjdk-21/ubuntu/22.04/Dockerfile )](./openjdk-21/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 22.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`    | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
-| openjdk-14 ( 14.0.2 ) + Ubuntu 22.04 | `openjdk-14`, `openjdk-14-ubuntu`, `openjdk-14-ubuntu-22`, `openjdk-14-ubuntu-2204`             | *[( openjdk-14/ubuntu/22.04/Dockerfile )](./openjdk-14/ubuntu/22.04/Dockerfile)* |
-| openjdk-11 ( 11.0.19 ) + Ubuntu 22.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-22`, `openjdk-11-ubuntu-2204`            | *[( openjdk-11/ubuntu/22.04/Dockerfile )](./openjdk-11/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 24.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-24`, `openjdk-17-ubuntu-2404`             | *[( openjdk-17/ubuntu/24.04/Dockerfile )](./openjdk-17/ubuntu/24.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 22.04 | `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`                                                | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 20.04 | `openjdk-17-ubuntu-20`, `openjdk-17-ubuntu-2004`                                               | *[( openjdk-17/ubuntu/20.04/Dockerfile )](./openjdk-17/ubuntu/20.04/Dockerfile)* |
-| openjdk-14 ( 14.0.2 ) + Ubuntu 20.04 | `openjdk-14`, `openjdk-14-ubuntu`, `openjdk-14-ubuntu-20`, `openjdk-14-ubuntu-2004`             | *[( openjdk-14/ubuntu/20.04/Dockerfile )](./openjdk-14/ubuntu/20.04/Dockerfile)* |
-| openjdk-11 ( 11.0.19 ) + Ubuntu 20.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-20`, `openjdk-11-ubuntu-2004`            | *[( openjdk-11/ubuntu/20.04/Dockerfile )](./openjdk-11/ubuntu/20.04/Dockerfile)* |
+| openjdk-21 + Ubuntu 24.04 | `openjdk-21`, `openjdk-21-ubuntu`, `openjdk-21-ubuntu-24`, `openjdk-21-ubuntu-2404`,`latest`    | *[( openjdk-21/ubuntu/24.04/Dockerfile )](./openjdk-21/ubuntu/24.04/Dockerfile)* |
+| openjdk-21 + Ubuntu 22.04 | `openjdk-21-ubuntu-22`, `openjdk-21-ubuntu-2204`                                                | *[( openjdk-21/ubuntu/22.04/Dockerfile )](./openjdk-21/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 22.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`    | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 22.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-22`, `openjdk-11-ubuntu-2204`            | *[( openjdk-11/ubuntu/22.04/Dockerfile )](./openjdk-11/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 24.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-24`, `openjdk-17-ubuntu-2404`             | *[( openjdk-17/ubuntu/24.04/Dockerfile )](./openjdk-17/ubuntu/24.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 22.04 | `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`                                                | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 20.04 | `openjdk-17-ubuntu-20`, `openjdk-17-ubuntu-2004`                                               | *[( openjdk-17/ubuntu/20.04/Dockerfile )](./openjdk-17/ubuntu/20.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 20.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-20`, `openjdk-11-ubuntu-2004`            | *[( openjdk-11/ubuntu/20.04/Dockerfile )](./openjdk-11/ubuntu/20.04/Dockerfile)* |
 | 8 ( 8u342 ) + Ubuntu 20.04              | `8`, `8-ubuntu`, `8-ubuntu-20`, `8-ubuntu-2004`                                              | *[( 8/ubuntu/20.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*    
-| openjdk-11 ( 11.0.19+7 ) + Ubuntu 18.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-18`, `openjdk-11-ubuntu-1804`          | *[( openjdk-11/ubuntu/18.04/Dockerfile )](./openjdk-11/ubuntu/18.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 18.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-18`, `openjdk-11-ubuntu-1804`          | *[( openjdk-11/ubuntu/18.04/Dockerfile )](./openjdk-11/ubuntu/18.04/Dockerfile)* |
 | 8 ( 8u201 ) + Ubuntu 18.04              | `8`, `8-ubuntu`, `8-ubuntu-18`, `8-ubuntu-1804`                                              | *[( 8/ubuntu/18.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*                   |
 | 8 ( 8u201 ) + Ubuntu 16.04              | `8-ubuntu-1604`, `8-ubuntu-16`                                                               | *[( 8/ubuntu/16.04/Dockerfile )](./8/ubuntu/16.04/Dockerfile)*     
-| openjdk-8( 8u342b07 ) + Ubuntu 20.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-20`, `openjdk-8-ubuntu-2004`              | *[( openjdk-8/ubuntu/20.04/Dockerfile )](./openjdk-8/ubuntu/20.04/Dockerfile)*   |
-| openjdk-8( 8u222b10 ) + Ubuntu 18.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-18`, `openjdk-8-ubuntu-1804`              | *[( openjdk-8/ubuntu/18.04/Dockerfile )](./openjdk-8/ubuntu/18.04/Dockerfile)*   |
+| openjdk-8 + Ubuntu 20.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-20`, `openjdk-8-ubuntu-2004`              | *[( openjdk-8/ubuntu/20.04/Dockerfile )](./openjdk-8/ubuntu/20.04/Dockerfile)*   |
+| openjdk-8 + Ubuntu 18.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-18`, `openjdk-8-ubuntu-1804`              | *[( openjdk-8/ubuntu/18.04/Dockerfile )](./openjdk-8/ubuntu/18.04/Dockerfile)*   |
 | 8 ( 8u201 ) + Ubuntu 18.04              | `8`, `8-ubuntu`, `8-ubuntu-18`, `8-ubuntu-1804`,                                             | *[( 8/ubuntu/18.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*                   |
 | 8 ( 8u201 ) + Ubuntu 16.04              | `8-ubuntu-1604`, `8-ubuntu-16`                                                               | *[( 8/ubuntu/16.04/Dockerfile )](./8/ubuntu/16.04/Dockerfile)*                   |
 

diff --git a/openjdk-11/ubuntu/18.04/Dockerfile b/openjdk-11/ubuntu/18.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:18.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-11/ubuntu/18.04/java-x64.jinfo b/openjdk-11/ubuntu/18.04/java-x64.jinfo
diff --git a/openjdk-11/ubuntu/20.04/Dockerfile b/openjdk-11/ubuntu/20.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:20.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-11/ubuntu/20.04/java-x64.jinfo b/openjdk-11/ubuntu/20.04/java-x64.jinfo
diff --git a/openjdk-11/ubuntu/22.04/Dockerfile b/openjdk-11/ubuntu/22.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:22.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-11/ubuntu/22.04/java-x64.jinfo b/openjdk-11/ubuntu/22.04/java-x64.jinfo
diff --git a/openjdk-14/ubuntu/20.04/Dockerfile b/openjdk-14/ubuntu/20.04/Dockerfile
diff --git a/openjdk-14/ubuntu/20.04/java-x64.jinfo b/openjdk-14/ubuntu/20.04/java-x64.jinfo