浏览代码

Install default-mysql-client for PHP 7.3 (#2329)

Install default-mysql-client for PHP 7.3
Lukas Besch 5 年之前
父节点
当前提交
7247d8f7ce
共有 2 个文件被更改,包括 10 次插入2 次删除
  1. 5 1
      php-fpm/Dockerfile
  2. 5 1
      php-worker/Dockerfile

+ 5 - 1
php-fpm/Dockerfile

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

+ 5 - 1
php-worker/Dockerfile

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