commit
e021d7a452
@ -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 ###############################################
|
||||
|
||||
|
@ -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
|
||||
|
@ -1321,7 +1321,7 @@ USER root
|
||||
# Clean up
|
||||
RUN apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
||||
rm /var/log/lastlog /var/log/faillog
|
||||
rm -f /var/log/lastlog /var/log/faillog
|
||||
|
||||
# Configure non-root user.
|
||||
ARG PUID=1000
|
||||
|
785
react/package-lock.json
generated
785
react/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,7 @@
|
||||
"axios": "^0.21.2",
|
||||
"bootstrap": "^4.5.3",
|
||||
"jss-rtl": "^0.3.0",
|
||||
"node-sass": "^7.0.3",
|
||||
"node-sass": "^9.0.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"react": "^17.0.1",
|
||||
"react-bootstrap": "^1.4.0",
|
||||
|
@ -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
|
||||
@ -1853,7 +1865,7 @@ USER root
|
||||
# Clean up
|
||||
RUN apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
||||
rm /var/log/lastlog /var/log/faillog
|
||||
rm -f /var/log/lastlog /var/log/faillog
|
||||
|
||||
# Set default work directory
|
||||
WORKDIR /var/www
|
||||
|
Loading…
Reference in New Issue
Block a user