From 72c0ec9920345a547b72da270364ad0941bf6f10 Mon Sep 17 00:00:00 2001 From: Chris Wiegman Date: Mon, 3 Jun 2024 15:40:10 -0500 Subject: [PATCH 1/3] Add `mariadb-connector-c` to cli images --- cli/php8.1/alpine/Dockerfile | 3 ++- cli/php8.2/alpine/Dockerfile | 3 ++- cli/php8.3/alpine/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cli/php8.1/alpine/Dockerfile b/cli/php8.1/alpine/Dockerfile index 8c6b98a42b..59c86454c7 100644 --- a/cli/php8.1/alpine/Dockerfile +++ b/cli/php8.1/alpine/Dockerfile @@ -11,7 +11,8 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client + mysql-client \ + mariadb-connector-c RUN set -ex; \ mkdir -p /var/www/html; \ diff --git a/cli/php8.2/alpine/Dockerfile b/cli/php8.2/alpine/Dockerfile index 3c6e6c821e..465eb9c709 100644 --- a/cli/php8.2/alpine/Dockerfile +++ b/cli/php8.2/alpine/Dockerfile @@ -11,7 +11,8 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client + mysql-client \ + mariadb-connector-c RUN set -ex; \ mkdir -p /var/www/html; \ diff --git a/cli/php8.3/alpine/Dockerfile b/cli/php8.3/alpine/Dockerfile index 8c7744ec18..cb8c844f1d 100644 --- a/cli/php8.3/alpine/Dockerfile +++ b/cli/php8.3/alpine/Dockerfile @@ -11,7 +11,8 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client + mysql-client \ + mariadb-connector-c RUN set -ex; \ mkdir -p /var/www/html; \ From a0247023b70601b2e2b085e4c69acc2856e16736 Mon Sep 17 00:00:00 2001 From: Chris Wiegman Date: Thu, 6 Jun 2024 12:19:22 -0500 Subject: [PATCH 2/3] Revert "Add `mariadb-connector-c` to cli images" This reverts commit 72c0ec9920345a547b72da270364ad0941bf6f10. --- cli/php8.1/alpine/Dockerfile | 3 +-- cli/php8.2/alpine/Dockerfile | 3 +-- cli/php8.3/alpine/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cli/php8.1/alpine/Dockerfile b/cli/php8.1/alpine/Dockerfile index 59c86454c7..8c6b98a42b 100644 --- a/cli/php8.1/alpine/Dockerfile +++ b/cli/php8.1/alpine/Dockerfile @@ -11,8 +11,7 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client \ - mariadb-connector-c + mysql-client RUN set -ex; \ mkdir -p /var/www/html; \ diff --git a/cli/php8.2/alpine/Dockerfile b/cli/php8.2/alpine/Dockerfile index 465eb9c709..3c6e6c821e 100644 --- a/cli/php8.2/alpine/Dockerfile +++ b/cli/php8.2/alpine/Dockerfile @@ -11,8 +11,7 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client \ - mariadb-connector-c + mysql-client RUN set -ex; \ mkdir -p /var/www/html; \ diff --git a/cli/php8.3/alpine/Dockerfile b/cli/php8.3/alpine/Dockerfile index cb8c844f1d..8c7744ec18 100644 --- a/cli/php8.3/alpine/Dockerfile +++ b/cli/php8.3/alpine/Dockerfile @@ -11,8 +11,7 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client \ - mariadb-connector-c + mysql-client RUN set -ex; \ mkdir -p /var/www/html; \ From 267cef082dc0e4c04624cfcbe72b16f383e2cb19 Mon Sep 17 00:00:00 2001 From: Chris Wiegman Date: Thu, 6 Jun 2024 12:19:35 -0500 Subject: [PATCH 3/3] Apply missing template to Dockerfile template --- Dockerfile.template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.template b/Dockerfile.template index 846f7962e3..c03d28fdd0 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -31,7 +31,8 @@ RUN apk add --no-cache \ # bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104 bash \ less \ - mysql-client + mysql-client \ + mariadb-connector-c RUN set -ex; \ mkdir -p /var/www/html; \