From cb574599ca82b1609dddd4fec108e031a8adc11d Mon Sep 17 00:00:00 2001 From: Mario Kranjec Date: Wed, 19 Feb 2020 12:44:06 +0100 Subject: [PATCH 1/2] fix: mysql-client has no installation candidate --- php-fpm/Dockerfile | 4 ---- php-worker/Dockerfile | 4 ---- 2 files changed, 8 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index b89af535..c638e689 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -810,11 +810,7 @@ USER root ARG INSTALL_MYSQL_CLIENT=false RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \ apt-get -y install default-mysql-client \ - ;else \ - apt-get -y install mysql-client \ - ;fi \ ;fi ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 47170541..5b2319e8 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -96,11 +96,7 @@ RUN set -eux; \ # Install MySQL Client: ARG INSTALL_MYSQL_CLIENT=false 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 \ - ;fi \ ;fi # Install FFMPEG: From 62747a2870adc967076de368040326dc69d1f268 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 12 Mar 2020 09:39:45 +0800 Subject: [PATCH 2/2] Update Dockerfile php-worker fix add package name --- php-worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 5b2319e8..8b18ba8a 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -96,7 +96,7 @@ RUN set -eux; \ # Install MySQL Client: ARG INSTALL_MYSQL_CLIENT=false RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ - apk --update add default-mysql-client \ + apk --update add mysql-client \ ;fi # Install FFMPEG: