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

Merge pull request #2511 from metalcamp/fix/mysql-client-installation-candidate 

Fix: Mysql-client has no installation candidate
This commit is contained in:
Shao Yu-Lung (Allen) 2020-03-12 10:14:10 +08:00 committed by GitHub
parent c32bf95530 62747a2870
commit 123e52e563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php-fpm/Dockerfile
View File

@ -810,11 +810,7 @@ USER root
ARG INSTALL_MYSQL_CLIENT=false ARG INSTALL_MYSQL_CLIENT=false
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
apt-get -y install default-mysql-client \ apt-get -y install default-mysql-client \
;else \
apt-get -y install mysql-client \
;fi \
;fi ;fi
########################################################################### ###########################################################################

4
php-worker/Dockerfile
View File

@ -103,11 +103,7 @@ RUN set -eux; \
# Install MySQL Client: # Install MySQL Client:
ARG INSTALL_MYSQL_CLIENT=false ARG INSTALL_MYSQL_CLIENT=false
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
apk --update add default-mysql-client \
;else \
apk --update add mysql-client \ apk --update add mysql-client \
;fi \
;fi ;fi
# Install FFMPEG: # Install FFMPEG: