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
commit 78e0394926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions

View File

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

View File

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

View File

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