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

Merge pull request #3194 from erikn69/fix_tests 

Fix TESTS
This commit is contained in:
Shao Yu-Lung (Allen) 2022-04-13 09:17:46 +08:00 committed by GitHub
parent 5028e0c37b cb77808a94
commit 6092304046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -99,7 +99,7 @@ SHELL_OH_MY_ZSH_ALIASES=false
WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest
WORKSPACE_COMPOSER_GLOBAL_INSTALL=true WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
WORKSPACE_COMPOSER_VERSION=2 WORKSPACE_COMPOSER_VERSION=2
WORKSPACE_COMPOSER_AUTH=false WORKSPACE_COMPOSER_AUTH_JSON=false
WORKSPACE_COMPOSER_REPO_PACKAGIST= WORKSPACE_COMPOSER_REPO_PACKAGIST=
WORKSPACE_NVM_NODEJS_ORG_MIRROR= WORKSPACE_NVM_NODEJS_ORG_MIRROR=
WORKSPACE_INSTALL_NODE=true WORKSPACE_INSTALL_NODE=true

2
docker-compose.yml
View File

@ -111,7 +111,7 @@ services:
- INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS} - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
- COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL} - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
- COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION} - COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION}
- COMPOSER_AUTH=${WORKSPACE_COMPOSER_AUTH} - COMPOSER_AUTH_JSON=${WORKSPACE_COMPOSER_AUTH_JSON}
- COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST} - COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST}
- INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH} - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
- INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY} - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}

8
workspace/Dockerfile
View File

@ -159,10 +159,10 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
;fi ;fi
# Check if auth file is disabled # Check if auth file is disabled
ARG COMPOSER_AUTH=false ARG COMPOSER_AUTH_JSON=false
ENV COMPOSER_AUTH ${COMPOSER_AUTH} ENV COMPOSER_AUTH_JSON ${COMPOSER_AUTH_JSON}
RUN if [ ${COMPOSER_AUTH} = false ]; then \ RUN if [ ${COMPOSER_AUTH_JSON} = false ]; then \
# remove the file # remove the file
rm /home/laradock/.composer/auth.json \ rm /home/laradock/.composer/auth.json \
;fi ;fi
@ -305,7 +305,7 @@ RUN set -eux; \
# SMB: # SMB:
########################################################################### ###########################################################################
if [ ${INSTALL_SMB} = true ]; then \ if [ ${INSTALL_SMB} = true ]; then \
apt-get install -yqq smbclient php-smbclient coreutils; \ apt-get install -yqq smbclient php${LARADOCK_PHP_VERSION}-smbclient coreutils; \
fi; \ fi; \
########################################################################### ###########################################################################
# IMAP: # IMAP: