Merge pull request #826 from uselagoon/mariadb_connector

Add mariadb-connector-c package to support mysql8
uselagoon · Sep 18, 2023 · 654eed2 · 654eed2
2 parents 8918a35 + 21e6fc8
commit 654eed2
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 2 deletions.
diff --git a/images/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile
@@ -41,6 +41,7 @@ RUN \
         mariadb-common=~10.11 \
         mariadb-server-utils=~10.11 \
         mariadb=~10.11 \
+        mariadb-connector-c \
         net-tools \
         pwgen \
         tzdata \

diff --git a/images/mariadb/10.4.Dockerfile b/images/mariadb/10.4.Dockerfile
@@ -41,6 +41,7 @@ RUN \
         mariadb-common=~10.4 \
         mariadb-server-utils=~10.4 \
         mariadb=~10.4 \
+        mariadb-connector-c \
         net-tools \
         pwgen \
         tini \

diff --git a/images/mariadb/10.5.Dockerfile b/images/mariadb/10.5.Dockerfile
@@ -41,6 +41,7 @@ RUN \
         mariadb-common=~10.5 \
         mariadb-server-utils=~10.5 \
         mariadb=~10.5 \
+        mariadb-connector-c \
         net-tools \
         pwgen \
         tini \

diff --git a/images/mariadb/10.6.Dockerfile b/images/mariadb/10.6.Dockerfile
@@ -41,6 +41,7 @@ RUN \
         mariadb-common=~10.6 \
         mariadb-server-utils=~10.6 \
         mariadb=~10.6 \
+        mariadb-connector-c \
         net-tools \
         pwgen \
         tini \

diff --git a/images/node-cli/16.Dockerfile b/images/node-cli/16.Dockerfile
@@ -16,6 +16,7 @@ RUN apk add --no-cache git \
         procps \
         coreutils \
         mariadb-client \
+        mariadb-connector-c \
         postgresql-client \
         mongodb-tools \
         openssh-sftp-server \
@@ -44,4 +45,4 @@ RUN chmod 400 /home/.ssh/lagoon_cli.key
 ENV SSH_AUTH_SOCK=/tmp/ssh-agent
 
 ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
-CMD ["/bin/docker-sleep"]
+CMD ["/bin/docker-sleep"]
diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile
@@ -16,6 +16,7 @@ RUN apk add --no-cache git \
         procps \
         coreutils \
         mariadb-client \
+        mariadb-connector-c \
         postgresql-client \
         mongodb-tools \
         openssh-sftp-server \
@@ -43,4 +44,4 @@ RUN chmod 400 /home/.ssh/lagoon_cli.key
 ENV SSH_AUTH_SOCK=/tmp/ssh-agent
 
 ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
-CMD ["/bin/docker-sleep"]
+CMD ["/bin/docker-sleep"]
diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile
@@ -16,6 +16,7 @@ RUN apk add --no-cache git \
         procps \
         coreutils \
         mariadb-client \
+        mariadb-connector-c \
         postgresql-client \
         mongodb-tools \
         openssh-sftp-server \

diff --git a/images/php-cli/8.0.Dockerfile b/images/php-cli/8.0.Dockerfile
@@ -12,6 +12,7 @@ RUN apk add --no-cache git \
         findutils \
         gzip  \
         mariadb-client \
+        mariadb-connector-c \
         mongodb-tools \
         nodejs-current=~18 \
         npm \

diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile
@@ -12,6 +12,7 @@ RUN apk add --no-cache git \
         findutils \
         gzip  \
         mariadb-client \
+        mariadb-connector-c \
         mongodb-tools \
         nodejs-dev=~18 \
         npm \

diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile
@@ -12,6 +12,7 @@ RUN apk add --no-cache git \
         findutils \
         gzip  \
         mariadb-client \
+        mariadb-connector-c \
         mongodb-tools \
         nodejs=~18 \
         npm \