Skip to content

Commit

Permalink
Merge pull request #911 from uselagoon/upgrade/alpine_3_18_3_19
Browse files Browse the repository at this point in the history
Upgrade/alpine 3 18 3 19
  • Loading branch information
tobybellwood authored Jan 23, 2024
2 parents c89212f + e089e4c commit 02db70e
Show file tree
Hide file tree
Showing 25 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion images/commons/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/mariadb/10.11.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/mongo/4.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/node/18.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/node/20.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/commons as commons
FROM node:20.11-alpine3.18
FROM node:20.11-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"
Expand Down
2 changes: 1 addition & 1 deletion images/php-cli/8.2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk update \
mariadb-client \
mariadb-connector-c \
mongodb-tools \
nodejs=~18 \
nodejs=~20 \
npm \
openssh-client \
openssh-sftp-server \
Expand Down
2 changes: 1 addition & 1 deletion images/php-cli/8.3.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apk add --no-cache git \
mariadb-client \
mariadb-connector-c \
mongodb-tools \
nodejs-current=~20 \
nodejs=~20 \
npm \
openssh-client \
openssh-sftp-server \
Expand Down
1 change: 1 addition & 0 deletions images/php-fpm/8.1.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ FROM composer:latest as healthcheckbuilder

RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6

# php:8.1.26-fpm-alpine3.18 segfaults on alpine 3.19
FROM php:8.1.27-fpm-alpine3.18

LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
Expand Down
2 changes: 1 addition & 1 deletion images/php-fpm/8.2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.15-fpm-alpine3.18
FROM php:8.2.15-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"
Expand Down
2 changes: 1 addition & 1 deletion images/php-fpm/8.3.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-fpm-alpine3.18
FROM php:8.3.2-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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/11.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/12.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/13.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/14.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/15.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/postgres/16.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/python/3.10.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/python/3.11.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/python/3.8.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/python/3.9.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/redis/6.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/redis/7.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/ruby/3.0.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/ruby/3.1.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/ruby/3.2.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/commons as commons

FROM ruby:3.2.3-alpine3.18
FROM ruby:3.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"
Expand Down

0 comments on commit 02db70e

Please sign in to comment.