From dd7be70596c3f5d0987329855b404e9b16c27b52 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 17 Jun 2023 14:21:34 +0300 Subject: [PATCH] Add Java Development Kit --- .env.example | 1 + docker-compose.yml | 1 + workspace/Dockerfile | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/.env.example b/.env.example index 564790bc77..0f3498bd6e 100644 --- a/.env.example +++ b/.env.example @@ -215,6 +215,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 index 8c96db92fe..a1c90b6905 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -294,6 +294,7 @@ services: - PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME} - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT} - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS} + - INSTALL_JDK=${WORKSPACE_INSTALL_JDK} - http_proxy - https_proxy - no_proxy diff --git a/workspace/Dockerfile b/workspace/Dockerfile index b4ec4b5f48..41c4dc6a9e 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1825,6 +1825,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