Merge pull request laradock#3402 from abordage/add-jdk

Add Java Development Kit
Faks · Jul 24, 2023 · b94d5af · b94d5af
2 parents 785d0c9 + 3b7932e
commit b94d5af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/.env.example b/.env.example
@@ -217,6 +217,7 @@ WORKSPACE_INSTALL_EVENT=false
 WORKSPACE_INSTALL_DNSUTILS=true
 WORKSPACE_XDEBUG_PORT=9000
 WORKSPACE_VITE_PORT=5173
+WORKSPACE_INSTALL_JDK=true
 
 ### PHP_FPM ###############################################
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -297,6 +297,7 @@ services:
           - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
           - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
           - INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
+          - INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
           - http_proxy
           - https_proxy
           - no_proxy

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
@@ -1842,6 +1842,18 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
     apt-get update && apt-get install -y dnsutils \
 ;fi
 
+###########################################################################
+# Java Development Kit:
+###########################################################################
+
+ARG INSTALL_JDK=false
+
+RUN if [ ${INSTALL_JDK} = true ]; then \
+    apt-get update \
+    && apt-get install -y default-jdk ca-certificates-java \
+    && update-ca-certificates -f \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch