Merge pull request #8 from laradock/master

fork sync
This commit is contained in:
Dawid Makowski 2023-07-31 22:20:18 +02:00 committed by GitHub
commit e021d7a452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 320 additions and 485 deletions

View File

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

View File

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

View File

@ -1321,7 +1321,7 @@ USER root
# Clean up # Clean up
RUN apt-get clean && \ RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ 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. # Configure non-root user.
ARG PUID=1000 ARG PUID=1000

785
react/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
"axios": "^0.21.2", "axios": "^0.21.2",
"bootstrap": "^4.5.3", "bootstrap": "^4.5.3",
"jss-rtl": "^0.3.0", "jss-rtl": "^0.3.0",
"node-sass": "^7.0.3", "node-sass": "^9.0.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^17.0.1", "react": "^17.0.1",
"react-bootstrap": "^1.4.0", "react-bootstrap": "^1.4.0",

View File

@ -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
@ -1853,7 +1865,7 @@ USER root
# Clean up # Clean up
RUN apt-get clean && \ RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ 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 # Set default work directory
WORKDIR /var/www WORKDIR /var/www