Merge pull request #3402 from abordage/add-jdk
Add Java Development Kit
This commit is contained in:
commit
b94d5af0e2
@ -217,6 +217,7 @@ WORKSPACE_INSTALL_EVENT=false
|
|||||||
WORKSPACE_INSTALL_DNSUTILS=true
|
WORKSPACE_INSTALL_DNSUTILS=true
|
||||||
WORKSPACE_XDEBUG_PORT=9000
|
WORKSPACE_XDEBUG_PORT=9000
|
||||||
WORKSPACE_VITE_PORT=5173
|
WORKSPACE_VITE_PORT=5173
|
||||||
|
WORKSPACE_INSTALL_JDK=true
|
||||||
|
|
||||||
### PHP_FPM ###############################################
|
### PHP_FPM ###############################################
|
||||||
|
|
||||||
|
@ -297,6 +297,7 @@ services:
|
|||||||
- INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
|
- INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
|
||||||
- INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
|
- INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
|
||||||
- INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
|
- INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
|
||||||
|
- INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
|
||||||
- http_proxy
|
- http_proxy
|
||||||
- https_proxy
|
- https_proxy
|
||||||
- no_proxy
|
- no_proxy
|
||||||
|
@ -1842,6 +1842,18 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
|
|||||||
apt-get update && apt-get install -y dnsutils \
|
apt-get update && apt-get install -y dnsutils \
|
||||||
;fi
|
;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
|
# Final Touch
|
||||||
|
Loading…
Reference in New Issue
Block a user