From 373348a29115bdc4607cc6225f4272f2fa52db52 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 12 Aug 2024 11:52:03 +1000 Subject: [PATCH 1/2] build: update images to alpine 3.20 --- images/commons/Dockerfile | 2 +- images/mongo/4.Dockerfile | 2 +- images/node/18.Dockerfile | 2 +- images/node/20.Dockerfile | 2 +- images/node/22.Dockerfile | 2 +- images/php-fpm/8.1.Dockerfile | 3 ++- images/php-fpm/8.2.Dockerfile | 3 ++- images/php-fpm/8.3.Dockerfile | 3 ++- images/postgres/12.Dockerfile | 2 +- images/postgres/13.Dockerfile | 2 +- images/postgres/14.Dockerfile | 2 +- images/postgres/15.Dockerfile | 2 +- images/postgres/16.Dockerfile | 2 +- images/python/3.10.Dockerfile | 2 +- images/python/3.11.Dockerfile | 2 +- images/python/3.12.Dockerfile | 2 +- images/python/3.8.Dockerfile | 2 +- images/python/3.9.Dockerfile | 2 +- images/redis/6.Dockerfile | 2 +- images/redis/7.Dockerfile | 2 +- images/ruby/3.1.Dockerfile | 2 +- images/ruby/3.2.Dockerfile | 2 +- images/ruby/3.3.Dockerfile | 2 +- 23 files changed, 26 insertions(+), 23 deletions(-) diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index 6f7934ef1..b6d78ff46 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -1,7 +1,7 @@ FROM webdevops/go-crond:23.12.0-alpine AS go-crond FROM amazeeio/envplate:v1.0.3 AS envplate -FROM alpine:3.19.3 +FROM alpine:3.20.2 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/mongo/4.Dockerfile b/images/mongo/4.Dockerfile index f6aeb3062..23d2c86f9 100644 --- a/images/mongo/4.Dockerfile +++ b/images/mongo/4.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM alpine:3.19.3 +FROM alpine:3.20.2 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/node/18.Dockerfile b/images/node/18.Dockerfile index 39a365b5c..9ac7e58bf 100644 --- a/images/node/18.Dockerfile +++ b/images/node/18.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM node:18.20-alpine3.19 +FROM node:18.20-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/node/20.Dockerfile b/images/node/20.Dockerfile index a939fcc36..181abb6ff 100644 --- a/images/node/20.Dockerfile +++ b/images/node/20.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM node:20.16-alpine3.19 +FROM node:20.16-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/node/22.Dockerfile b/images/node/22.Dockerfile index 3e5cac89d..0fff2c20a 100644 --- a/images/node/22.Dockerfile +++ b/images/node/22.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM node:22.6-alpine3.19 +FROM node:22.6-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index f26e8ace7..8bd7fa6b0 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 -FROM php:8.1.29-fpm-alpine3.19 +FROM php:8.1.29-fpm-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" @@ -128,6 +128,7 @@ ENV NEWRELIC_VERSION=11.0.0.13 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \ && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \ && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \ + && mkdir /etc/conf.d && mkdir /etc/init.d \ && NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=1 ./newrelic-install install \ && sed -i -e "s/newrelic.appname = .*/newrelic.appname = \"\${LAGOON_PROJECT:-noproject}-\${LAGOON_GIT_SAFE_BRANCH:-nobranch}\"/" /usr/local/etc/php/conf.d/newrelic.ini \ && sed -i -e "s/;newrelic.enabled = .*/newrelic.enabled = \${NEWRELIC_ENABLED:-false}/" /usr/local/etc/php/conf.d/newrelic.ini \ diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index 13d72307f..9995da570 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 -FROM php:8.2.22-fpm-alpine3.19 +FROM php:8.2.22-fpm-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" @@ -128,6 +128,7 @@ ENV NEWRELIC_VERSION=11.0.0.13 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \ && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \ && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \ + && mkdir /etc/conf.d && mkdir /etc/init.d \ && NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=1 ./newrelic-install install \ && sed -i -e "s/newrelic.appname = .*/newrelic.appname = \"\${LAGOON_PROJECT:-noproject}-\${LAGOON_GIT_SAFE_BRANCH:-nobranch}\"/" /usr/local/etc/php/conf.d/newrelic.ini \ && sed -i -e "s/;newrelic.enabled = .*/newrelic.enabled = \${NEWRELIC_ENABLED:-false}/" /usr/local/etc/php/conf.d/newrelic.ini \ diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile index d76619794..0e412734d 100644 --- a/images/php-fpm/8.3.Dockerfile +++ b/images/php-fpm/8.3.Dockerfile @@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 -FROM php:8.3.10-fpm-alpine3.19 +FROM php:8.3.10-fpm-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" @@ -137,6 +137,7 @@ ENV NEWRELIC_VERSION=11.0.0.13 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \ && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \ && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \ + && mkdir /etc/conf.d && mkdir /etc/init.d \ && NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=1 ./newrelic-install install \ && sed -i -e "s/newrelic.appname = .*/newrelic.appname = \"\${LAGOON_PROJECT:-noproject}-\${LAGOON_GIT_SAFE_BRANCH:-nobranch}\"/" /usr/local/etc/php/conf.d/newrelic.ini \ && sed -i -e "s/;newrelic.enabled = .*/newrelic.enabled = \${NEWRELIC_ENABLED:-false}/" /usr/local/etc/php/conf.d/newrelic.ini \ diff --git a/images/postgres/12.Dockerfile b/images/postgres/12.Dockerfile index b771bfb73..3bc008e9f 100644 --- a/images/postgres/12.Dockerfile +++ b/images/postgres/12.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:12.20-alpine3.19 +FROM postgres:12.20-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/postgres/13.Dockerfile b/images/postgres/13.Dockerfile index 045e512f6..e0f2a672b 100644 --- a/images/postgres/13.Dockerfile +++ b/images/postgres/13.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:13.16-alpine3.19 +FROM postgres:13.16-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/postgres/14.Dockerfile b/images/postgres/14.Dockerfile index 9ead8c0de..332574375 100644 --- a/images/postgres/14.Dockerfile +++ b/images/postgres/14.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:14.13-alpine3.19 +FROM postgres:14.13-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/postgres/15.Dockerfile b/images/postgres/15.Dockerfile index 158c6f7f1..08f88a105 100644 --- a/images/postgres/15.Dockerfile +++ b/images/postgres/15.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:15.8-alpine3.19 +FROM postgres:15.8-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/postgres/16.Dockerfile b/images/postgres/16.Dockerfile index 0417409a2..628027ca5 100644 --- a/images/postgres/16.Dockerfile +++ b/images/postgres/16.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:16.4-alpine3.19 +FROM postgres:16.4-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/python/3.10.Dockerfile b/images/python/3.10.Dockerfile index 542c7a42b..5bade8c44 100644 --- a/images/python/3.10.Dockerfile +++ b/images/python/3.10.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM python:3.10.14-alpine3.19 +FROM python:3.10.14-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/python/3.11.Dockerfile b/images/python/3.11.Dockerfile index 822effa22..5e148aa69 100644 --- a/images/python/3.11.Dockerfile +++ b/images/python/3.11.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM python:3.11.9-alpine3.19 +FROM python:3.11.9-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/python/3.12.Dockerfile b/images/python/3.12.Dockerfile index 4e27b3342..a6b66d0ab 100644 --- a/images/python/3.12.Dockerfile +++ b/images/python/3.12.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM python:3.12.3-alpine3.18 +FROM python:3.12.4-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/python/3.8.Dockerfile b/images/python/3.8.Dockerfile index 81974c8ca..81f3860a4 100644 --- a/images/python/3.8.Dockerfile +++ b/images/python/3.8.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM python:3.8.19-alpine3.19 +FROM python:3.8.19-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/python/3.9.Dockerfile b/images/python/3.9.Dockerfile index 53aff1a5d..2f8ed46d4 100644 --- a/images/python/3.9.Dockerfile +++ b/images/python/3.9.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM python:3.9.19-alpine3.19 +FROM python:3.9.19-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile index a4d1c2d3f..75b576d9e 100644 --- a/images/redis/6.Dockerfile +++ b/images/redis/6.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM redis:6.2.14-alpine3.19 +FROM redis:6.2.14-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/redis/7.Dockerfile b/images/redis/7.Dockerfile index 80507cc81..c19d29e6a 100644 --- a/images/redis/7.Dockerfile +++ b/images/redis/7.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM redis:7.2.5-alpine3.19 +FROM redis:7.2.5-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/ruby/3.1.Dockerfile b/images/ruby/3.1.Dockerfile index becb92d9f..1b494f658 100644 --- a/images/ruby/3.1.Dockerfile +++ b/images/ruby/3.1.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM ruby:3.1.6-alpine3.19 +FROM ruby:3.1.6-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/ruby/3.2.Dockerfile b/images/ruby/3.2.Dockerfile index bfc640345..062573bf6 100644 --- a/images/ruby/3.2.Dockerfile +++ b/images/ruby/3.2.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM ruby:3.2.5-alpine3.19 +FROM ruby:3.2.5-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" diff --git a/images/ruby/3.3.Dockerfile b/images/ruby/3.3.Dockerfile index d70ad9a0c..54a3eb816 100644 --- a/images/ruby/3.3.Dockerfile +++ b/images/ruby/3.3.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM ruby:3.3.4-alpine3.19 +FROM ruby:3.3.4-alpine3.20 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" From c361cdf5dd77a7e43db48e1e3d8a5eb2bf1c02ab Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 12 Aug 2024 11:52:03 +1000 Subject: [PATCH 2/2] build: use mariadb-client 10.11.6 for now --- images/node-cli/18.Dockerfile | 4 +--- images/node-cli/20.Dockerfile | 4 +--- images/node-cli/22.Dockerfile | 4 +--- images/php-cli/8.1.Dockerfile | 8 +++----- images/php-cli/8.2.Dockerfile | 8 +++----- images/php-cli/8.3.Dockerfile | 7 +++---- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile index 17822dd12..51ff46119 100644 --- a/images/node-cli/18.Dockerfile +++ b/images/node-cli/18.Dockerfile @@ -6,14 +6,12 @@ LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-image ENV LAGOON=node -RUN apk update \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ && apk add --no-cache bash \ coreutils \ findutils \ git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ openssh-client \ openssh-sftp-server \ diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile index c87bf22ca..2f9092f27 100644 --- a/images/node-cli/20.Dockerfile +++ b/images/node-cli/20.Dockerfile @@ -6,14 +6,12 @@ LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-image ENV LAGOON=node -RUN apk update \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ && apk add --no-cache bash \ coreutils \ findutils \ git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ openssh-client \ openssh-sftp-server \ diff --git a/images/node-cli/22.Dockerfile b/images/node-cli/22.Dockerfile index 4cda97717..7858927de 100644 --- a/images/node-cli/22.Dockerfile +++ b/images/node-cli/22.Dockerfile @@ -6,14 +6,12 @@ LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-image ENV LAGOON=node -RUN apk update \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ && apk add --no-cache bash \ coreutils \ findutils \ git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ openssh-client \ openssh-sftp-server \ diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index 22f194df5..0c27ba5b1 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -8,14 +8,12 @@ ENV LAGOON=cli STOPSIGNAL SIGTERM -RUN apk update \ - && apk add --no-cache git \ - bash \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ + && apk add --no-cache bash \ coreutils \ findutils \ + git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ nodejs=~20 \ npm \ diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index 85eca1b73..a3106df6b 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -8,14 +8,12 @@ ENV LAGOON=cli STOPSIGNAL SIGTERM -RUN apk update \ - && apk add --no-cache git \ - bash \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ + && apk add --no-cache bash \ coreutils \ findutils \ + git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ nodejs=~20 \ npm \ diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile index 540b0a756..ff4ed3167 100644 --- a/images/php-cli/8.3.Dockerfile +++ b/images/php-cli/8.3.Dockerfile @@ -8,13 +8,12 @@ ENV LAGOON=cli STOPSIGNAL SIGTERM -RUN apk add --no-cache git \ - bash \ +RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \ + && apk add --no-cache bash \ coreutils \ findutils \ + git \ gzip \ - mariadb-client \ - mariadb-connector-c \ mongodb-tools \ nodejs=~20 \ npm \