ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2707 from abler98/feature/workspace/lnav 

Add support for lnav in workspace
This commit is contained in:
Shao Yu-Lung (Allen) 2020-09-15 21:58:56 +08:00 committed by GitHub
parent ade6f6b1a7 2c41e2a749
commit 78e0394926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -151,6 +151,7 @@ services:
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG} - INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
- INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF} - INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF}
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL} - INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
- INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
- http_proxy - http_proxy
- https_proxy - https_proxy
- no_proxy - no_proxy

1
env-example
View File

@ -178,6 +178,7 @@ WORKSPACE_VUE_CLI_SERVE_HOST_PORT=8080
WORKSPACE_VUE_CLI_UI_HOST_PORT=8001 WORKSPACE_VUE_CLI_UI_HOST_PORT=8001
WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT=4200 WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT=4200
WORKSPACE_INSTALL_GIT_PROMPT=false WORKSPACE_INSTALL_GIT_PROMPT=false
WORKSPACE_INSTALL_LNAV=false
### PHP_FPM ############################################### ### PHP_FPM ###############################################

10
workspace/Dockerfile
View File

@ -1376,6 +1376,16 @@ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
docker-php-ext-install xmlrpc \ docker-php-ext-install xmlrpc \
;fi ;fi
###########################################################################
# Lnav:
###########################################################################
ARG INSTALL_LNAV=false
RUN if [ ${INSTALL_LNAV} = true ]; then \
apt-get install -y lnav \
;fi
########################################################################### ###########################################################################
# Check PHP version: # Check PHP version:
########################################################################### ###########################################################################