Merge pull request #1068 from uselagoon/testing/dockerfile_tidy

Add more labels to Lagoon images
uselagoon · Aug 20, 2024 · 429e126 · 429e126
2 parents 43acc8b + 471fb6b
commit 429e126
Show file tree

Hide file tree

Showing 75 changed files with 706 additions and 281 deletions.
diff --git 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \