From 889f7c03a43dc19a8a0edd9f07c53c586a9b3eb4 Mon Sep 17 00:00:00 2001 From: Blaize M Kaye Date: Fri, 19 Jan 2024 06:52:44 +1300 Subject: [PATCH 1/5] First pass up updating 3.18 to 3.19 --- images/commons/Dockerfile | 2 +- images/mariadb/10.11.Dockerfile | 2 +- images/mongo/4.Dockerfile | 2 +- images/node/18.Dockerfile | 2 +- images/node/20.Dockerfile | 2 +- images/php-cli/8.1.Dockerfile | 2 +- images/php-cli/8.2.Dockerfile | 2 +- images/php-fpm/8.1.Dockerfile | 2 +- images/php-fpm/8.2.Dockerfile | 2 +- images/php-fpm/8.3.Dockerfile | 2 +- images/postgres/11.Dockerfile | 2 +- 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.8.Dockerfile | 2 +- images/python/3.9.Dockerfile | 2 +- images/redis/6.Dockerfile | 2 +- images/redis/7.Dockerfile | 2 +- images/ruby/3.0.Dockerfile | 2 +- images/ruby/3.1.Dockerfile | 2 +- images/ruby/3.2.Dockerfile | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index 704fc5e19..30a401e5a 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -1,7 +1,7 @@ FROM webdevops/go-crond:23.10.0-beta-alpine AS go-crond FROM amazeeio/envplate:v1.0.3 AS envplate -FROM alpine:3.18.5 +FROM alpine:3.19.0 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/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile index d5d24d582..46c61836b 100644 --- a/images/mariadb/10.11.Dockerfile +++ b/images/mariadb/10.11.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM alpine:3.18.5 +FROM alpine:3.19.0 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 c0af9a09d..943671b02 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.18.5 +FROM alpine:3.19.0 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 5c6a6e873..770fb6b70 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.19-alpine3.18 +FROM node:18.19-alpine3.19 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 38e93f12e..797d8405f 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.10-alpine3.18 +FROM node:20.10-alpine3.19 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-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index 9be0c2269..4da78aa12 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -15,7 +15,7 @@ RUN apk update \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs-dev=~18 \ + nodejs-dev=~20 \ npm \ openssh-client \ openssh-sftp-server \ diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index c515643df..9a6dd8b0c 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -15,7 +15,7 @@ RUN apk update \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs=~18 \ + nodejs=~20 \ npm \ openssh-client \ openssh-sftp-server \ diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index 217725b96..873d29f59 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.26-fpm-alpine3.18 +FROM php:8.1.26-fpm-alpine3.19 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.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index 5563c8a6a..1bd8ad687 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.13-fpm-alpine3.18 +FROM php:8.2.13-fpm-alpine3.19 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.3.Dockerfile b/images/php-fpm/8.3.Dockerfile index 8a5c63fe2..29abcde77 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.0-fpm-alpine3.18 +FROM php:8.3.0-fpm-alpine3.19 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/11.Dockerfile b/images/postgres/11.Dockerfile index d9df9aadf..17df40a56 100644 --- a/images/postgres/11.Dockerfile +++ b/images/postgres/11.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:11.22-alpine3.18 +FROM postgres:11.22-alpine3.19 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/12.Dockerfile b/images/postgres/12.Dockerfile index 901897413..da5b23c8c 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.17-alpine3.18 +FROM postgres:12.17-alpine3.19 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 74b529459..67fae6e52 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.13-alpine3.18 +FROM postgres:13.13-alpine3.19 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 7484073ef..effa06c9b 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.10-alpine3.18 +FROM postgres:14.10-alpine3.19 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 1f59b3887..f289c0b25 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.5-alpine3.18 +FROM postgres:15.5-alpine3.19 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 500ef5733..4713781f7 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.1-alpine3.18 +FROM postgres:16.1-alpine3.19 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 a4b9ba183..a9dcc310d 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.13-alpine3.18 +FROM python:3.10.13-alpine3.19 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 25cf57b38..d18bd8de2 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.7-alpine3.18 +FROM python:3.11.7-alpine3.19 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 4201e4ab0..ab4455202 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.18-alpine3.18 +FROM python:3.8.18-alpine3.19 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 c299068e0..b3118f7cc 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.18-alpine3.18 +FROM python:3.9.18-alpine3.19 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 bbf3b22ee..a4d1c2d3f 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.18 +FROM redis:6.2.14-alpine3.19 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 a811b9392..4dd175056 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.3-alpine3.18 +FROM redis:7.2.3-alpine3.19 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.0.Dockerfile b/images/ruby/3.0.Dockerfile index 2622dc801..041e50355 100644 --- a/images/ruby/3.0.Dockerfile +++ b/images/ruby/3.0.Dockerfile @@ -1,6 +1,6 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons -# Alpine 3.18 image not available for Ruby 3.0 +# Alpine 3.19 image not available for Ruby 3.0 FROM ruby:3.0.6-alpine3.16 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" diff --git a/images/ruby/3.1.Dockerfile b/images/ruby/3.1.Dockerfile index 4e9196917..43ae6fa4a 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.4-alpine3.18 +FROM ruby:3.1.4-alpine3.19 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 148ecde62..537a2181c 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.2-alpine3.18 +FROM ruby:3.2.2-alpine3.19 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 8d057bd7b83795ed582298da9e845a82cdd5c396 Mon Sep 17 00:00:00 2001 From: Blaize M Kaye Date: Fri, 19 Jan 2024 10:00:03 +1300 Subject: [PATCH 2/5] Updates nodejs-current to 21 --- images/php-cli/8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile index 21d8e2254..389cb5a79 100644 --- a/images/php-cli/8.3.Dockerfile +++ b/images/php-cli/8.3.Dockerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache git \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs-current=~20 \ + nodejs-current=~21 \ npm \ openssh-client \ openssh-sftp-server \ From 96db022475ef1992ee3236c2f945d3e1ae0950bd Mon Sep 17 00:00:00 2001 From: Blaize M Kaye Date: Fri, 19 Jan 2024 13:34:55 +1300 Subject: [PATCH 3/5] Testing segfault --- images/php-fpm/8.1.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index 873d29f59..ea61fc844 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -5,7 +5,8 @@ FROM composer:latest as healthcheckbuilder RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 -FROM php:8.1.26-fpm-alpine3.19 +# php:8.1.26-fpm-alpine3.18 segfaults on alpine 3.19 +FROM php:8.1.26-fpm-alpine3.18 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 b789beed3b8e5c3695c6c2da912da59565fc660a Mon Sep 17 00:00:00 2001 From: Blaize M Kaye Date: Fri, 19 Jan 2024 13:42:43 +1300 Subject: [PATCH 4/5] Testing segfault --- images/php-cli/8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index 4da78aa12..9be0c2269 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -15,7 +15,7 @@ RUN apk update \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs-dev=~20 \ + nodejs-dev=~18 \ npm \ openssh-client \ openssh-sftp-server \ From e089e4cc4b384305aa8f492778db3b2e7d3e929c Mon Sep 17 00:00:00 2001 From: Blaize Kaye Date: Tue, 23 Jan 2024 10:37:32 +1300 Subject: [PATCH 5/5] Update images/php-cli/8.3.Dockerfile Co-authored-by: Toby Bellwood --- images/php-cli/8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile index 389cb5a79..2d18b950a 100644 --- a/images/php-cli/8.3.Dockerfile +++ b/images/php-cli/8.3.Dockerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache git \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs-current=~21 \ + nodejs=~20 \ npm \ openssh-client \ openssh-sftp-server \