Add mariadb client

Resolves #120
lando · Dec 8, 2024 · 8bf3ff9 · 8bf3ff9
1 parent ce4d773
commit 8bf3ff9
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
 * Updated 8.4RC image to 8.4 stable.
+* Added MariaDB client tools to PHP 7.4-8.4 images [#120](https://github.com/lando/php/issues/120).
 * Added `xdebug` and `imagick` extension to PHP 8.4 images.
-* Added `xhprof` extension to PHP 7.4+ images.
+* Added `xhprof` extension to PHP 7.4-8.4 images.
 * Added `imagick` extension to PHP 8.3 images.
 
 ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)

diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile
@@ -4,13 +4,20 @@ FROM php:7.4-apache-bullseye
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
     exiftool \
     git-core \
     gnupg2 \
     libonig-dev \
+    mariadb-client \
     openssl \
     postgresql-client-13 \
     pv \

diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile
@@ -4,13 +4,20 @@ FROM php:7.4-fpm-bullseye
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
   libonig-dev \
+  mariadb-client \
   openssl \
   postgresql-client-13 \
   pv \

diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.0-apache-bullseye
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
     exiftool \
     git-core \
     gnupg2 \
     libonig-dev \
+    mariadb-client \
     openssl \
     postgresql-client-13 \
     pv \

diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.0-fpm-bullseye
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
     exiftool \
     git-core \
     gnupg2 \
     libonig-dev \
+    mariadb-client \
     openssl \
     postgresql-client-13 \
     pv \

diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.1-apache-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
+  mariadb-client \
   openssl \
   postgresql-client-15 \
   pv \

diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.1-fpm-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
+  mariadb-client \
   openssl \
   postgresql-client-15 \
   pv \

diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.2-apache-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
+  mariadb-client \
   openssl \
   postgresql-client-15 \
   pv \

diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.2-fpm-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
+  mariadb-client \
   openssl \
   postgresql-client-15 \
   pv \

diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile
@@ -4,6 +4,12 @@ FROM php:8.3-apache-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile
@@ -4,13 +4,20 @@ FROM php:8.3-fpm-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
   exiftool \
   git-core \
   gnupg2 \
+  mariadb-client \
   openssl \
   postgresql-client-15 \
   pv \

diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile
@@ -4,13 +4,21 @@ FROM php:8.4-apache-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
     exiftool \
     git-core \
     gnupg2 \
+    mariadb-client \
+    mariadb-client-compat \
     openssl \
     postgresql-client-15 \
     pv \

diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile
@@ -4,6 +4,12 @@ FROM php:8.4-fpm-bookworm
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN \
+  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
+  mkdir -p /etc/apt/keyrings \
+  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
+
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
@@ -12,6 +18,8 @@ RUN \
     exiftool \
     git-core \
     gnupg2 \
+    mariadb-client \
+    mariadb-client-compat \
     openssl \
     postgresql-client-15 \
     pv \