Merge pull request #3402 from abordage/add-jdk

Add Java Development Kit
This commit is contained in:
Shao Yu-Lung (Allen) 2023-07-24 23:22:04 +08:00 committed by GitHub
commit b94d5af0e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions

View File

@ -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 ###############################################

View File

@ -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

View File

@ -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