From 21e6fc8b1c1aee886877cb71b1aea9d4f219a651 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 11 Sep 2023 15:20:13 +1000 Subject: [PATCH] Add mariadb-connector-c package to support mysql8 --- images/mariadb/10.11.Dockerfile | 1 + images/mariadb/10.4.Dockerfile | 1 + images/mariadb/10.5.Dockerfile | 1 + images/mariadb/10.6.Dockerfile | 1 + images/node-cli/16.Dockerfile | 3 ++- images/node-cli/18.Dockerfile | 3 ++- images/node-cli/20.Dockerfile | 1 + images/php-cli/8.0.Dockerfile | 1 + images/php-cli/8.1.Dockerfile | 1 + images/php-cli/8.2.Dockerfile | 1 + 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile index 4d30330b8..ff934bb35 100644 --- 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 index d855bc1d0..18b994871 100644 --- 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 index 0aa0ed28f..3eb46b33c 100644 --- 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 index 106d691e8..967eac46a 100644 --- 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 index d5ee59a55..8fef0d834 100644 --- 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"] \ No newline at end of file +CMD ["/bin/docker-sleep"] diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile index 46878dff4..4dcff8f0e 100644 --- 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"] \ No newline at end of file +CMD ["/bin/docker-sleep"] diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile index fcc6f2787..f81030eb2 100644 --- 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 index 32eebb66a..0dac2e599 100644 --- 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 index d5fe16da5..ef6e5f0b3 100644 --- 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 index 382f8a8d4..9d8b31ed3 100644 --- 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 \