From 2948bed6cb929fa3f114546dbf6f34457e44d46c Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 20 Aug 2024 12:06:15 +1000 Subject: [PATCH 1/2] build: relabel docker images and align builds --- images/commons/Dockerfile | 18 ++++++++++------- images/mariadb-drupal/10.11.Dockerfile | 11 ++++++++-- images/mariadb-drupal/10.4.Dockerfile | 11 ++++++++-- images/mariadb-drupal/10.5.Dockerfile | 11 ++++++++-- images/mariadb-drupal/10.6.Dockerfile | 11 ++++++++-- images/mariadb/10.11.Dockerfile | 14 +++++++++---- images/mariadb/10.4.Dockerfile | 14 +++++++++---- images/mariadb/10.5.Dockerfile | 14 +++++++++---- images/mariadb/10.6.Dockerfile | 14 +++++++++---- images/mongo/4.Dockerfile | 18 ++++++++++------- images/mysql/8.0.Dockerfile | 15 ++++++++++---- images/mysql/8.4.Dockerfile | 16 ++++++++++----- images/nginx-drupal/Dockerfile | 13 ++++++++---- images/nginx/Dockerfile | 16 +++++++++------ images/node-builder/18.Dockerfile | 13 ++++++++---- images/node-builder/20.Dockerfile | 13 ++++++++---- images/node-builder/22.Dockerfile | 13 ++++++++---- images/node-cli/18.Dockerfile | 13 ++++++++---- images/node-cli/20.Dockerfile | 13 ++++++++---- images/node-cli/22.Dockerfile | 13 ++++++++---- images/node/18.Dockerfile | 16 +++++++++------ images/node/20.Dockerfile | 16 +++++++++------ images/node/22.Dockerfile | 16 +++++++++------ images/opensearch/2.Dockerfile | 16 +++++++++------ images/php-cli-drupal/8.1.Dockerfile | 11 ++++++++-- images/php-cli-drupal/8.2.Dockerfile | 11 ++++++++-- images/php-cli-drupal/8.3.Dockerfile | 11 ++++++++-- images/php-cli/8.1.Dockerfile | 11 ++++++++-- images/php-cli/8.2.Dockerfile | 11 ++++++++-- images/php-cli/8.3.Dockerfile | 11 ++++++++-- images/php-fpm/8.1.Dockerfile | 18 ++++++++++------- images/php-fpm/8.2.Dockerfile | 18 ++++++++++------- images/php-fpm/8.3.Dockerfile | 18 ++++++++++------- images/postgres-ckan/11.Dockerfile | 11 ++++++++-- images/postgres-drupal/11.Dockerfile | 11 ++++++++-- images/postgres-drupal/12.Dockerfile | 11 ++++++++-- images/postgres-drupal/13.Dockerfile | 11 ++++++++-- images/postgres-drupal/14.Dockerfile | 11 ++++++++-- images/postgres-drupal/15.Dockerfile | 11 ++++++++-- images/postgres-drupal/16.Dockerfile | 11 ++++++++-- images/postgres/11.Dockerfile | 16 +++++++++------ images/postgres/12.Dockerfile | 16 +++++++++------ images/postgres/13.Dockerfile | 16 +++++++++------ images/postgres/14.Dockerfile | 16 +++++++++------ images/postgres/15.Dockerfile | 16 +++++++++------ images/postgres/16.Dockerfile | 16 +++++++++------ images/python/3.10.Dockerfile | 13 +++++++++--- images/python/3.11.Dockerfile | 13 +++++++++--- images/python/3.12.Dockerfile | 13 +++++++++--- images/python/3.8.Dockerfile | 13 +++++++++--- images/python/3.9.Dockerfile | 13 +++++++++--- images/rabbitmq-cluster/Dockerfile | 10 ++++++++++ images/rabbitmq/Dockerfile | 14 +++++++++++-- images/redis-persistent/6.Dockerfile | 11 ++++++++-- images/redis-persistent/7.Dockerfile | 11 ++++++++-- images/redis/6.Dockerfile | 17 ++++++++++------ images/redis/7.Dockerfile | 17 ++++++++++------ images/ruby/3.1.Dockerfile | 13 +++++++++--- images/ruby/3.2.Dockerfile | 13 +++++++++--- images/ruby/3.3.Dockerfile | 13 +++++++++--- images/solr-drupal/8.Dockerfile | 13 +++++++++--- images/solr-drupal/9.Dockerfile | 13 +++++++++--- images/solr/8.Dockerfile | 19 +++++++++++------- images/solr/9.Dockerfile | 19 +++++++++++------- images/varnish-drupal/6.Dockerfile | 11 ++++++++-- images/varnish-drupal/7.Dockerfile | 11 ++++++++-- images/varnish-persistent-drupal/6.Dockerfile | 11 ++++++++-- images/varnish-persistent-drupal/7.Dockerfile | 11 ++++++++-- images/varnish-persistent/6.Dockerfile | 11 ++++++++-- images/varnish-persistent/7.Dockerfile | 11 ++++++++-- images/varnish/6.Dockerfile | 20 +++++++++++-------- images/varnish/7.Dockerfile | 16 +++++++++------ 72 files changed, 705 insertions(+), 276 deletions(-) diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index b6d78ff46..08d409167 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -3,13 +3,21 @@ FROM amazeeio/envplate:v1.0.3 AS envplate 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/commons/Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Base image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/commons" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.20" ENV LAGOON=commons COPY lagoon/ /lagoon/ -RUN mkdir -p /lagoon/bin +RUN mkdir -p /lagoon/bin \ + && echo $LAGOON_VERSION > /lagoon/version COPY fix-permissions fix-dir-permissions docker-sleep entrypoint-readiness wait-for /bin/ COPY .bashrc /home/.bashrc @@ -28,10 +36,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd -ARG LAGOON_VERSION -RUN echo $LAGOON_VERSION > /lagoon/version -ENV LAGOON_VERSION=$LAGOON_VERSION - ENV TMPDIR=/tmp \ TMP=/tmp \ HOME=/home \ diff --git a/images/mariadb-drupal/10.11.Dockerfile b/images/mariadb-drupal/10.11.Dockerfile index da3335e1b..14fdac321 100644 --- a/images/mariadb-drupal/10.11.Dockerfile +++ b/images/mariadb-drupal/10.11.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/mariadb-10.11 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal/10.11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.11 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.11-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/mariadb-10.11" ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.4.Dockerfile b/images/mariadb-drupal/10.4.Dockerfile index 675cf20b5..975d14907 100644 --- a/images/mariadb-drupal/10.4.Dockerfile +++ b/images/mariadb-drupal/10.4.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/mariadb-10.4 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal/10.4.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.4 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.4-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/mariadb-10.4" ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.5.Dockerfile b/images/mariadb-drupal/10.5.Dockerfile index 210c1733e..7b471fbe6 100644 --- a/images/mariadb-drupal/10.5.Dockerfile +++ b/images/mariadb-drupal/10.5.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/mariadb-10.5 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal/10.5.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.5 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.5-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/mariadb-10.5" ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.6.Dockerfile b/images/mariadb-drupal/10.6.Dockerfile index 4835214fa..5ae4470c4 100644 --- a/images/mariadb-drupal/10.6.Dockerfile +++ b/images/mariadb-drupal/10.6.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/mariadb-10.6 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal/10.6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.6 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.6-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/mariadb-10.6" ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile index 296096dd1..e9332ab49 100644 --- a/images/mariadb/10.11.Dockerfile +++ b/images/mariadb/10.11.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM alpine:3.19.3 -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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/10.11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.11 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.11" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.19" + +ENV LAGOON=mariadb # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/mariadb/10.4.Dockerfile b/images/mariadb/10.4.Dockerfile index 25dbdcd1a..69c23420c 100644 --- a/images/mariadb/10.4.Dockerfile +++ b/images/mariadb/10.4.Dockerfile @@ -1,13 +1,19 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons # Held at 3.12.x to ensure mariadb 10.4 whilst we evaluate upgrade path FROM alpine:3.12.12 -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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/10.4.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.4 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.4" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.12" + +ENV LAGOON=mariadb # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/mariadb/10.5.Dockerfile b/images/mariadb/10.5.Dockerfile index efe35489f..77bdc987f 100644 --- a/images/mariadb/10.5.Dockerfile +++ b/images/mariadb/10.5.Dockerfile @@ -1,13 +1,19 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons # Held at 3.14.x to ensure mariadb 10.5 whilst we evaluate upgrade path FROM alpine:3.14.10 -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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/10.5.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.5 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.5" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.14" + +ENV LAGOON=mariadb # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/mariadb/10.6.Dockerfile b/images/mariadb/10.6.Dockerfile index a991e84f3..0a18f67ab 100644 --- a/images/mariadb/10.6.Dockerfile +++ b/images/mariadb/10.6.Dockerfile @@ -1,13 +1,19 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons # Held at 3.17.x to ensure mariadb 10.6 whilst we evaluate upgrade path FROM alpine:3.17.9 -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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/10.6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MariaDB 10.6 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mariadb-10.6" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.17" + +ENV LAGOON=mariadb # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/mongo/4.Dockerfile b/images/mongo/4.Dockerfile index 23d2c86f9..aa489162a 100644 --- a/images/mongo/4.Dockerfile +++ b/images/mongo/4.Dockerfile @@ -1,17 +1,21 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - -ENV LAGOON=mongo - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mongo/4.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MongoDB 4 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mongo-4" +LABEL org.opencontainers.image.base.name="docker.io/alpine:3.20" + +ENV LAGOON=mongo COPY --from=commons /lagoon /lagoon -COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/ +COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ COPY --from=commons /sbin/tini /sbin/ COPY --from=commons /home /home diff --git a/images/mysql/8.0.Dockerfile b/images/mysql/8.0.Dockerfile index e9c7382b6..6f6f92d2a 100644 --- a/images/mysql/8.0.Dockerfile +++ b/images/mysql/8.0.Dockerfile @@ -1,12 +1,19 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM mysql:8.0.39-oracle -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" ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mysql/8.0.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MySQL 8.0 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mysql-8.0" +LABEL org.opencontainers.image.base.name="docker.io/mysql:8.0-oracle" + +ENV LAGOON=mysql # Copy commons files COPY --from=commons /lagoon /lagoon @@ -61,7 +68,7 @@ RUN touch /var/log/mariadb-slow.log && /bin/fix-permissions /var/log/mariadb-slo # change the user of the Docker Image to this user. RUN usermod -a -G root mysql USER mysql -ENV USER_NAME mysql +ENV USER_NAME=mysql WORKDIR /var/lib/mysql EXPOSE 3306 diff --git a/images/mysql/8.4.Dockerfile b/images/mysql/8.4.Dockerfile index 32967c01a..620ade743 100644 --- a/images/mysql/8.4.Dockerfile +++ b/images/mysql/8.4.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM mysql:8.4.2-oracle -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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/mysql/8.4.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="MySQL 8.4 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/mysql-8.4" +LABEL org.opencontainers.image.base.name="docker.io/mysql:8.4-oracle" + +ENV LAGOON=mysql # Copy commons files COPY --from=commons /lagoon /lagoon @@ -61,7 +67,7 @@ RUN touch /var/log/mariadb-slow.log && /bin/fix-permissions /var/log/mariadb-slo # change the user of the Docker Image to this user. RUN usermod -a -G root mysql USER mysql -ENV USER_NAME mysql +ENV USER_NAME=mysql WORKDIR /var/lib/mysql EXPOSE 3306 diff --git a/images/nginx-drupal/Dockerfile b/images/nginx-drupal/Dockerfile index db78c85cd..2eb052a3f 100644 --- a/images/nginx-drupal/Dockerfile +++ b/images/nginx-drupal/Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/nginx -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" - -ENV LAGOON=nginx +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/nginx-drupal/Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="OpenResty (Nginx) image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/nginx-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/nginx" RUN mkdir -p /etc/nginx/conf.d/drupal diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index b7c492256..41e63ce6e 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -1,14 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM openresty/openresty:1.25.3.2-0-alpine -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" - -ENV LAGOON=nginx - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/nginx/Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="OpenResty (Nginx) image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/nginx" +LABEL org.opencontainers.image.base.name="docker.io/openresty/openresty:1.25-alpine" + +ENV LAGOON=nginx # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/node-builder/18.Dockerfile b/images/node-builder/18.Dockerfile index 039f72e64..07676a155 100644 --- a/images/node-builder/18.Dockerfile +++ b/images/node-builder/18.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-builder/18.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 18 builder image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-18-builder" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-18" RUN apk update \ && apk add --no-cache \ diff --git a/images/node-builder/20.Dockerfile b/images/node-builder/20.Dockerfile index 48f8e6c25..640ddb83d 100644 --- a/images/node-builder/20.Dockerfile +++ b/images/node-builder/20.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-builder/20.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 20 builder image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-20-builder" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-20" RUN apk update \ && apk add --no-cache \ diff --git a/images/node-builder/22.Dockerfile b/images/node-builder/22.Dockerfile index 0915a6f45..c6d3d687e 100644 --- a/images/node-builder/22.Dockerfile +++ b/images/node-builder/22.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-22 -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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-builder/22.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 22 builder image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-22-builder" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-22" RUN apk update \ && apk add --no-cache \ diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile index 51ff46119..1746fb61a 100644 --- a/images/node-cli/18.Dockerfile +++ b/images/node-cli/18.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-cli/18.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 18 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-18-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-18" 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 \ diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile index 2f9092f27..e035d368f 100644 --- a/images/node-cli/20.Dockerfile +++ b/images/node-cli/20.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-cli/20.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 20 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-20-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-20" 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 \ diff --git a/images/node-cli/22.Dockerfile b/images/node-cli/22.Dockerfile index 7858927de..3f021a15f 100644 --- a/images/node-cli/22.Dockerfile +++ b/images/node-cli/22.Dockerfile @@ -1,10 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/node-22 -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" - -ENV LAGOON=node +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node-cli/22.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 22 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-22-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/node-22" 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 \ diff --git a/images/node/18.Dockerfile b/images/node/18.Dockerfile index 9ac7e58bf..bad56c3a3 100644 --- a/images/node/18.Dockerfile +++ b/images/node/18.Dockerfile @@ -1,14 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - -ENV LAGOON=node - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node/18.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 18 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-18" +LABEL org.opencontainers.image.base.name="docker.io/node:18-alpine3.20" + +ENV LAGOON=node # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/node/20.Dockerfile b/images/node/20.Dockerfile index 181abb6ff..52f3a5657 100644 --- a/images/node/20.Dockerfile +++ b/images/node/20.Dockerfile @@ -1,14 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - -ENV LAGOON=node - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node/20.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 20 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-20" +LABEL org.opencontainers.image.base.name="docker.io/node:20-alpine3.20" + +ENV LAGOON=node # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/node/22.Dockerfile b/images/node/22.Dockerfile index 0fff2c20a..8d365f353 100644 --- a/images/node/22.Dockerfile +++ b/images/node/22.Dockerfile @@ -1,14 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - -ENV LAGOON=node - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/node/22.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Node.js 22 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/node-22" +LABEL org.opencontainers.image.base.name="docker.io/node:22-alpine3.20" + +ENV LAGOON=node # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/opensearch/2.Dockerfile b/images/opensearch/2.Dockerfile index 173b19712..13d26ab49 100644 --- a/images/opensearch/2.Dockerfile +++ b/images/opensearch/2.Dockerfile @@ -1,14 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM opensearchproject/opensearch:2.16.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" - -ENV LAGOON=opensearch - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/opensearch/2.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="OpenSearch 2 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/opensearch-2" +LABEL org.opencontainers.image.base.name="docker.io/opensearchproject/opensearch:2" + +ENV LAGOON=opensearch # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/php-cli-drupal/8.1.Dockerfile b/images/php-cli-drupal/8.1.Dockerfile index 40876dcdc..2ec49e078 100644 --- a/images/php-cli-drupal/8.1.Dockerfile +++ b/images/php-cli-drupal/8.1.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.1-cli -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal/8.1.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.1 cli image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.1-cli-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.1-cli" ENV LAGOON=cli-drupal diff --git a/images/php-cli-drupal/8.2.Dockerfile b/images/php-cli-drupal/8.2.Dockerfile index 414649f41..da349b3c4 100644 --- a/images/php-cli-drupal/8.2.Dockerfile +++ b/images/php-cli-drupal/8.2.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.2-cli -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal/8.2.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.2 cli image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.2-cli-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.2-cli" ENV LAGOON=cli-drupal diff --git a/images/php-cli-drupal/8.3.Dockerfile b/images/php-cli-drupal/8.3.Dockerfile index 54d6779a3..c58ccff8d 100644 --- a/images/php-cli-drupal/8.3.Dockerfile +++ b/images/php-cli-drupal/8.3.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.3-cli -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal/8.3.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.3 cli image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.3-cli-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.3-cli" ENV LAGOON=cli-drupal diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index 0c27ba5b1..4e5de2d97 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.1-fpm -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli/8.1.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.1 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.1-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.1-fpm" ENV LAGOON=cli diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index a3106df6b..04b349d2a 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.2-fpm -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli/8.2.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.2 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.2-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.2-fpm" ENV LAGOON=cli diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile index ff4ed3167..90d977c81 100644 --- a/images/php-cli/8.3.Dockerfile +++ b/images/php-cli/8.3.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/php-8.3-fpm -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli/8.3.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.3 cli image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.3-cli" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/php-8.3-fpm" ENV LAGOON=cli diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index 8bd7fa6b0..a69a38b3b 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -1,19 +1,23 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons -FROM composer:latest as healthcheckbuilder +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.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" - -ENV LAGOON=php - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/8.1.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.1 FPM image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.1-fpm" +LABEL org.opencontainers.image.base.name="docker.io/php:8.1-fpm-alpine3.20" + +ENV LAGOON=php # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index 9995da570..eefe73772 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -1,19 +1,23 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons -FROM composer:latest as healthcheckbuilder +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.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" - -ENV LAGOON=php - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/8.2.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.2 FPM image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.2-fpm" +LABEL org.opencontainers.image.base.name="docker.io/php:8.2-fpm-alpine3.20" + +ENV LAGOON=php # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile index 0e412734d..9b89aed98 100644 --- a/images/php-fpm/8.3.Dockerfile +++ b/images/php-fpm/8.3.Dockerfile @@ -1,19 +1,23 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons -FROM composer:latest as healthcheckbuilder +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.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" - -ENV LAGOON=php - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/8.3.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PHP 8.3 FPM image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/php-8.3-fpm" +LABEL org.opencontainers.image.base.name="docker.io/php:8.3-fpm-alpine3.20" + +ENV LAGOON=php # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/postgres-ckan/11.Dockerfile b/images/postgres-ckan/11.Dockerfile index f99f6d578..8bdb31f37 100644 --- a/images/postgres-ckan/11.Dockerfile +++ b/images/postgres-ckan/11.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-11 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-ckan/11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 11 image optimised for CKAN workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-11-ckan" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-11" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/11.Dockerfile b/images/postgres-drupal/11.Dockerfile index 4ab39c397..1502be414 100644 --- a/images/postgres-drupal/11.Dockerfile +++ b/images/postgres-drupal/11.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-11 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 11 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-11-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-11" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/12.Dockerfile b/images/postgres-drupal/12.Dockerfile index 71b31a3cc..7b5305af4 100644 --- a/images/postgres-drupal/12.Dockerfile +++ b/images/postgres-drupal/12.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-12 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/12.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 12 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-12-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-12" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/13.Dockerfile b/images/postgres-drupal/13.Dockerfile index 88aacb30b..0f8fb4c52 100644 --- a/images/postgres-drupal/13.Dockerfile +++ b/images/postgres-drupal/13.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-13 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/13.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 13 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-13-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-13" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/14.Dockerfile b/images/postgres-drupal/14.Dockerfile index 088d81f46..3e000e3d0 100644 --- a/images/postgres-drupal/14.Dockerfile +++ b/images/postgres-drupal/14.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-14 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/14.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 14 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-14-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-14" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/15.Dockerfile b/images/postgres-drupal/15.Dockerfile index 9ac5cc05e..ad76568e2 100644 --- a/images/postgres-drupal/15.Dockerfile +++ b/images/postgres-drupal/15.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-15 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/15.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 15 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-15-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-15" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/16.Dockerfile b/images/postgres-drupal/16.Dockerfile index 129bb9f8b..4a47f102b 100644 --- a/images/postgres-drupal/16.Dockerfile +++ b/images/postgres-drupal/16.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/postgres-16 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres-drupal/16.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 16 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-16-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/postgres-16" # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres/11.Dockerfile b/images/postgres/11.Dockerfile index 17df40a56..7bfad0aae 100644 --- a/images/postgres/11.Dockerfile +++ b/images/postgres/11.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 11 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-11" +LABEL org.opencontainers.image.base.name="docker.io/postgres:11-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/postgres/12.Dockerfile b/images/postgres/12.Dockerfile index 3bc008e9f..22ed71334 100644 --- a/images/postgres/12.Dockerfile +++ b/images/postgres/12.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/12.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 12 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-12" +LABEL org.opencontainers.image.base.name="docker.io/postgres:12-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/postgres/13.Dockerfile b/images/postgres/13.Dockerfile index e0f2a672b..acd8f6ba4 100644 --- a/images/postgres/13.Dockerfile +++ b/images/postgres/13.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/13.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 13 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-13" +LABEL org.opencontainers.image.base.name="docker.io/postgres:13-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/postgres/14.Dockerfile b/images/postgres/14.Dockerfile index 332574375..8afd5f5b4 100644 --- a/images/postgres/14.Dockerfile +++ b/images/postgres/14.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/14.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 14 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-14" +LABEL org.opencontainers.image.base.name="docker.io/postgres:14-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/postgres/15.Dockerfile b/images/postgres/15.Dockerfile index 08f88a105..1190963d3 100644 --- a/images/postgres/15.Dockerfile +++ b/images/postgres/15.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/15.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 15 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-15" +LABEL org.opencontainers.image.base.name="docker.io/postgres:15-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/postgres/16.Dockerfile b/images/postgres/16.Dockerfile index 628027ca5..cf8b5c1df 100644 --- a/images/postgres/16.Dockerfile +++ b/images/postgres/16.Dockerfile @@ -1,12 +1,18 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/16.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="PostgreSQL 16 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/postgres-16" +LABEL org.opencontainers.image.base.name="docker.io/postgres:16-alpine3.20" + +ENV LAGOON=postgres # Copy commons files COPY --from=commons /lagoon /lagoon @@ -31,8 +37,6 @@ RUN apk update \ RUN fix-permissions /etc/passwd \ && mkdir -p /home -ENV LAGOON=postgres - COPY postgres-backup.sh /lagoon/ RUN echo -e "local all all md5\nhost all all 0.0.0.0/0 md5" >> /usr/local/share/postgresql/pg_hba.conf diff --git a/images/python/3.10.Dockerfile b/images/python/3.10.Dockerfile index 5bade8c44..41f0a1f34 100644 --- a/images/python/3.10.Dockerfile +++ b/images/python/3.10.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.10.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Python 3.10 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/python-3.10" +LABEL org.opencontainers.image.base.name="docker.io/python:3.10-alpine3.20" ENV LAGOON=python diff --git a/images/python/3.11.Dockerfile b/images/python/3.11.Dockerfile index 5e148aa69..ab9580f8e 100644 --- a/images/python/3.11.Dockerfile +++ b/images/python/3.11.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.11.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Python 3.11 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/python-3.11" +LABEL org.opencontainers.image.base.name="docker.io/python:3.11-alpine3.20" ENV LAGOON=python diff --git a/images/python/3.12.Dockerfile b/images/python/3.12.Dockerfile index ac98aedd6..cbeed8bf8 100644 --- a/images/python/3.12.Dockerfile +++ b/images/python/3.12.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM python:3.12.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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.12.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Python 3.12 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/python-3.12" +LABEL org.opencontainers.image.base.name="docker.io/python:3.12-alpine3.20" ENV LAGOON=python diff --git a/images/python/3.8.Dockerfile b/images/python/3.8.Dockerfile index 81f3860a4..86e963c56 100644 --- a/images/python/3.8.Dockerfile +++ b/images/python/3.8.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.8.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Python 3.8 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/python-3.8" +LABEL org.opencontainers.image.base.name="docker.io/python:3.8-alpine3.20" ENV LAGOON=python diff --git a/images/python/3.9.Dockerfile b/images/python/3.9.Dockerfile index 2f8ed46d4..8db52dec1 100644 --- a/images/python/3.9.Dockerfile +++ b/images/python/3.9.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.9.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Python 3.9 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/python-3.9" +LABEL org.opencontainers.image.base.name="docker.io/python:3.9-alpine3.20" ENV LAGOON=python diff --git a/images/rabbitmq-cluster/Dockerfile b/images/rabbitmq-cluster/Dockerfile index 10516ad7b..fab8c2f03 100644 --- a/images/rabbitmq-cluster/Dockerfile +++ b/images/rabbitmq-cluster/Dockerfile @@ -1,6 +1,16 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/rabbitmq +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/rabbitmq-cluster/Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="RabbitMQ image optimised for clustered workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/rabbitmq-cluster" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/rabbitmq" + RUN rabbitmq-plugins --offline enable rabbitmq_peer_discovery_k8s ADD enabled_plugins /etc/rabbitmq/enabled_plugins diff --git a/images/rabbitmq/Dockerfile b/images/rabbitmq/Dockerfile index a0c63efc2..02f935e76 100644 --- a/images/rabbitmq/Dockerfile +++ b/images/rabbitmq/Dockerfile @@ -1,16 +1,26 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM rabbitmq:3.10.25-management-alpine ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/rabbitmq/Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="RabbitMQ image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/rabbitmq" +LABEL org.opencontainers.image.base.name="docker.io/rabbitmq:3-management-alpine" + +ENV LAGOON=rabbitmq ENV RABBITMQ_DEFAULT_USER='guest' \ RABBITMQ_DEFAULT_PASS='guest'\ RABBITMQ_DEFAULT_HA_PATTERN='^$'\ RABBITMQ_DEFAULT_VHOST='/' -COPY --from=commons /bin/ep /bin/fix-permissions /bin/ +COPY --from=commons /lagoon /lagoon +COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ RUN wget -P /plugins https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/3.10.2/rabbitmq_delayed_message_exchange-3.10.2.ez \ && chown rabbitmq:rabbitmq /plugins/rabbitmq_delayed_message_exchange-* \ diff --git a/images/redis-persistent/6.Dockerfile b/images/redis-persistent/6.Dockerfile index aff841d8e..f0f66d892 100644 --- a/images/redis-persistent/6.Dockerfile +++ b/images/redis-persistent/6.Dockerfile @@ -1,7 +1,14 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/redis-6 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/redis-persistent/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Redis 6 image optimised for persistent workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/redis-6-persistent" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/redis-6" ENV FLAVOR=persistent diff --git a/images/redis-persistent/7.Dockerfile b/images/redis-persistent/7.Dockerfile index 3fbad6070..945c3eb47 100644 --- a/images/redis-persistent/7.Dockerfile +++ b/images/redis-persistent/7.Dockerfile @@ -1,7 +1,14 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/redis-7 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/redis-persistent/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Redis 7 image optimised for persistent workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/redis-7-persistent" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/redis-7" ENV FLAVOR=persistent diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile index 75b576d9e..f53ed5096 100644 --- a/images/redis/6.Dockerfile +++ b/images/redis/6.Dockerfile @@ -1,15 +1,20 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/redis/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Redis 6 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/redis-6" +LABEL org.opencontainers.image.base.name="docker.io/redis:6-alpine3.20" ENV LAGOON=redis -ENV FLAVOR=ephemeral -ARG LAGOON_VERSION -ENV LAGOON_VERSION=$LAGOON_VERSION +ENV FLAVOR=ephemeral # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/redis/7.Dockerfile b/images/redis/7.Dockerfile index c19d29e6a..ba4ced79b 100644 --- a/images/redis/7.Dockerfile +++ b/images/redis/7.Dockerfile @@ -1,15 +1,20 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/redis/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Redis 7 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/redis-7" +LABEL org.opencontainers.image.base.name="docker.io/redis:7-alpine3.20" ENV LAGOON=redis -ENV FLAVOR=ephemeral -ARG LAGOON_VERSION -ENV LAGOON_VERSION=$LAGOON_VERSION +ENV FLAVOR=ephemeral # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/ruby/3.1.Dockerfile b/images/ruby/3.1.Dockerfile index 1b494f658..ff9ba894f 100644 --- a/images/ruby/3.1.Dockerfile +++ b/images/ruby/3.1.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/ruby/3.1.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Ruby 3.1 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/ruby-3.1" +LABEL org.opencontainers.image.base.name="docker.io/ruby:3.1-alpine3.20" ENV LAGOON=ruby diff --git a/images/ruby/3.2.Dockerfile b/images/ruby/3.2.Dockerfile index 062573bf6..233e193fa 100644 --- a/images/ruby/3.2.Dockerfile +++ b/images/ruby/3.2.Dockerfile @@ -1,10 +1,17 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/ruby/3.2.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Ruby 3.2 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/ruby-3.2" +LABEL org.opencontainers.image.base.name="docker.io/ruby:3.2-alpine3.20" ENV LAGOON=ruby diff --git a/images/ruby/3.3.Dockerfile b/images/ruby/3.3.Dockerfile index 54a3eb816..4162b7588 100644 --- a/images/ruby/3.3.Dockerfile +++ b/images/ruby/3.3.Dockerfile @@ -1,9 +1,16 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons 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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/ruby/3.3.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Ruby 3.3 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/ruby-3.3" +LABEL org.opencontainers.image.base.name="docker.io/ruby:3.3-alpine3.20" ENV LAGOON=ruby diff --git a/images/solr-drupal/8.Dockerfile b/images/solr-drupal/8.Dockerfile index 6fed206f5..54f76d3fb 100644 --- a/images/solr-drupal/8.Dockerfile +++ b/images/solr-drupal/8.Dockerfile @@ -6,10 +6,17 @@ ADD https://git.drupalcode.org/project/search_api_solr.git#4.3.3 /search_api_sol ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/solr-8 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/8.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Solr 8 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/solr-8-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/solr-8" COPY --from=jumpstart /search_api_solr/jump-start/solr8/config-set /solr-conf/conf ENV SOLR_INSTALL_DIR=/opt/solr -CMD ["solr-precreate", "drupal", "/solr-conf"] \ No newline at end of file +CMD ["solr-precreate", "drupal", "/solr-conf"] diff --git a/images/solr-drupal/9.Dockerfile b/images/solr-drupal/9.Dockerfile index 45303dffe..91bb6e7ad 100644 --- a/images/solr-drupal/9.Dockerfile +++ b/images/solr-drupal/9.Dockerfile @@ -1,13 +1,20 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as jumpstart +FROM ${IMAGE_REPO:-lagoon}/commons AS jumpstart ADD https://git.drupalcode.org/project/search_api_solr.git#4.3.3 /search_api_solr ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/solr-9 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Solr 9 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/solr-9-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/solr-9" COPY --from=jumpstart /search_api_solr/jump-start/solr9/config-set /solr-conf/conf ENV SOLR_INSTALL_DIR=/opt/solr diff --git a/images/solr/8.Dockerfile b/images/solr/8.Dockerfile index ff3d5a707..7c98ded4c 100755 --- a/images/solr/8.Dockerfile +++ b/images/solr/8.Dockerfile @@ -1,20 +1,25 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM solr:8.11.3-slim -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Solr 8 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/solr-8" +LABEL org.opencontainers.image.base.name="docker.io/solr:8" ENV LAGOON=solr + ENV SOLR_DATA_HOME=/var/solr ENV SOLR_LOGS_DIR=/opt/solr/server/logs -ARG LAGOON_VERSION -ENV LAGOON_VERSION=$LAGOON_VERSION - # Copy commons files COPY --from=commons /lagoon /lagoon -COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/ +COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ COPY --from=commons /home/.bashrc /home/.bashrc ENV TMPDIR=/tmp \ diff --git a/images/solr/9.Dockerfile b/images/solr/9.Dockerfile index cb2bb36a5..1442eeb01 100755 --- a/images/solr/9.Dockerfile +++ b/images/solr/9.Dockerfile @@ -1,20 +1,25 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM solr:9.6.1 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/solr/9.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Solr 9 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/solr-9" +LABEL org.opencontainers.image.base.name="docker.io/solr:9" ENV LAGOON=solr + ENV SOLR_DATA_HOME=/var/solr ENV SOLR_LOGS_DIR=/opt/solr/server/logs -ARG LAGOON_VERSION -ENV LAGOON_VERSION=$LAGOON_VERSION - # Copy commons files COPY --from=commons /lagoon /lagoon -COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/ +COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ COPY --from=commons /home/.bashrc /home/.bashrc ENV TMPDIR=/tmp \ diff --git a/images/varnish-drupal/6.Dockerfile b/images/varnish-drupal/6.Dockerfile index c8b48c910..d0f6c0542 100644 --- a/images/varnish-drupal/6.Dockerfile +++ b/images/varnish-drupal/6.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-6 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 6 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-6-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-6" USER root diff --git a/images/varnish-drupal/7.Dockerfile b/images/varnish-drupal/7.Dockerfile index cdeabc4c9..1d8e62248 100644 --- a/images/varnish-drupal/7.Dockerfile +++ b/images/varnish-drupal/7.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-7 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 7 image optimised for Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-7-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-7" USER root diff --git a/images/varnish-persistent-drupal/6.Dockerfile b/images/varnish-persistent-drupal/6.Dockerfile index 191dee774..9e4bf01ab 100644 --- a/images/varnish-persistent-drupal/6.Dockerfile +++ b/images/varnish-persistent-drupal/6.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-6-drupal -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-persistent-drupal/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 6 image optimised for persistent Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-6-persistent-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-6-drupal" VOLUME /var/cache/varnish diff --git a/images/varnish-persistent-drupal/7.Dockerfile b/images/varnish-persistent-drupal/7.Dockerfile index 50525e7cd..6382b389e 100644 --- a/images/varnish-persistent-drupal/7.Dockerfile +++ b/images/varnish-persistent-drupal/7.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-7-drupal -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-persistent-drupal/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 7 image optimised for persistent Drupal workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-7-persistent-drupal" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-7-drupal" VOLUME /var/cache/varnish diff --git a/images/varnish-persistent/6.Dockerfile b/images/varnish-persistent/6.Dockerfile index 0c95ee709..43f9011cd 100644 --- a/images/varnish-persistent/6.Dockerfile +++ b/images/varnish-persistent/6.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-6 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-persistent/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 6 image optimised for persistent workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-6-persistent" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-6" VOLUME /var/cache/varnish diff --git a/images/varnish-persistent/7.Dockerfile b/images/varnish-persistent/7.Dockerfile index 01f2cc311..0cba955da 100644 --- a/images/varnish-persistent/7.Dockerfile +++ b/images/varnish-persistent/7.Dockerfile @@ -1,8 +1,15 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/varnish-7 -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" +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-persistent/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 7 image optimised for persistent workloads running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-7-persistent" +LABEL org.opencontainers.image.base.name="docker.io/uselagoon/varnish-7" VOLUME /var/cache/varnish diff --git a/images/varnish/6.Dockerfile b/images/varnish/6.Dockerfile index 9be01f5bc..5638ed2e6 100644 --- a/images/varnish/6.Dockerfile +++ b/images/varnish/6.Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons -FROM varnish:6.0.13 as vmod +FROM varnish:6.0.13 AS vmod USER root RUN apt-get update \ @@ -33,17 +33,21 @@ RUN cd /tmp && curl -sSLO https://github.com/varnish/varnish-modules/archive/${V FROM varnish:6.0.13 -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" - -ENV LAGOON=varnish - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish/6.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 6 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-6" +LABEL org.opencontainers.image.base.name="docker.io/varnish:6.0" + +ENV LAGOON=varnish # Copy commons files COPY --from=commons /lagoon /lagoon -COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/ +COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ COPY --from=commons /home /home ENV TMPDIR=/tmp \ diff --git a/images/varnish/7.Dockerfile b/images/varnish/7.Dockerfile index fe2a8396f..d0e596e96 100644 --- a/images/varnish/7.Dockerfile +++ b/images/varnish/7.Dockerfile @@ -1,15 +1,19 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +FROM ${IMAGE_REPO:-lagoon}/commons AS commons FROM varnish:7.5-alpine -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" - -ENV LAGOON=varnish - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION +LABEL org.opencontainers.image.authors="The Lagoon Authors" +LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/varnish/7.Dockerfile" +LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" +LABEL org.opencontainers.image.version="${LAGOON_VERSION}" +LABEL org.opencontainers.image.description="Varnish 7 image optimised for running in Lagoon in production and locally" +LABEL org.opencontainers.image.title="uselagoon/varnish-7" +LABEL org.opencontainers.image.base.name="docker.io/varnish:7-alpine" + +ENV LAGOON=varnish # Copy commons files COPY --from=commons /lagoon /lagoon From 471fb6bff008213a5892523ad9d15fc1b9235420 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 20 Aug 2024 12:06:27 +1000 Subject: [PATCH 2/2] build: docker-compose and readme updates --- helpers/images-docker-compose.yml | 2 -- helpers/services-docker-compose.yml | 2 -- images/php-fpm/README.md | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/helpers/images-docker-compose.yml b/helpers/images-docker-compose.yml index 5a1c97412..9b9189257 100644 --- a/helpers/images-docker-compose.yml +++ b/helpers/images-docker-compose.yml @@ -1,5 +1,3 @@ -version: '2.3' - x-user: &default-user # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000` diff --git a/helpers/services-docker-compose.yml b/helpers/services-docker-compose.yml index 7e0ecb564..e21f123af 100644 --- a/helpers/services-docker-compose.yml +++ b/helpers/services-docker-compose.yml @@ -1,5 +1,3 @@ -version: '2.3' - x-user: &default-user # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000` diff --git a/images/php-fpm/README.md b/images/php-fpm/README.md index 4d8f8f822..982feca22 100644 --- a/images/php-fpm/README.md +++ b/images/php-fpm/README.md @@ -1 +1 @@ -Please reference the [Lagoon Docs](https://lagoon.readthedocs.io/en/latest/using_lagoon/docker_images/php-fpm/) +Please reference the [Lagoon Docs](https://docs.lagoon.sh/docker-images/php-fpm/)