From 04a9ba9618c07add25dd8725dbd840cbe0f50ebe Mon Sep 17 00:00:00 2001 From: Chris Burgess Date: Mon, 10 Feb 2025 09:45:48 +1300 Subject: [PATCH] isle-buildkit#377: Add opencontainers annotations for image source, URL --- activemq/Dockerfile | 3 +++ alpaca/Dockerfile | 3 +++ base/Dockerfile | 3 +++ blazegraph/Dockerfile | 3 +++ cantaloupe/Dockerfile | 3 +++ code-server/Dockerfile | 3 +++ crayfish/Dockerfile | 3 +++ crayfits/Dockerfile | 3 +++ drupal/Dockerfile | 3 +++ fcrepo6/Dockerfile | 3 +++ fits/Dockerfile | 3 +++ handle/Dockerfile | 3 +++ homarus/Dockerfile | 3 +++ houdini/Dockerfile | 3 +++ hypercube/Dockerfile | 3 +++ java/Dockerfile | 3 +++ mariadb/Dockerfile | 5 ++++- matomo/Dockerfile | 3 +++ milliner/Dockerfile | 3 +++ nginx/Dockerfile | 3 +++ postgresql/Dockerfile | 3 +++ riprap/Dockerfile | 3 +++ solr/Dockerfile | 3 +++ test/Dockerfile | 3 +++ tomcat/Dockerfile | 3 +++ 25 files changed, 76 insertions(+), 1 deletion(-) diff --git a/activemq/Dockerfile b/activemq/Dockerfile index f3dd959b..a891c56e 100644 --- a/activemq/Dockerfile +++ b/activemq/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/activemq +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-tags depName=apache-activemq packageName=apache/activemq ARG ACTIVEMQ_VERSION=5.18.6 diff --git a/alpaca/Dockerfile b/alpaca/Dockerfile index 26002f97..7da0a78b 100644 --- a/alpaca/Dockerfile +++ b/alpaca/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/alpaca +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH ARG ALPACA_VERSION="2.2.0" ARG ALPACA_FILE="islandora-alpaca-app-${ALPACA_VERSION}-all.jar" diff --git a/base/Dockerfile b/base/Dockerfile index 460fb57e..a117dc57 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM alpine +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/base +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=s6-overlay packageName=just-containers/s6-overlay ARG S6_VERSION=3.2.0.2 diff --git a/blazegraph/Dockerfile b/blazegraph/Dockerfile index 6b732912..aa25f342 100644 --- a/blazegraph/Dockerfile +++ b/blazegraph/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM tomcat +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/blazegraph +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH ARG BLAZEGRAPH_VERSION="CANDIDATE_2_1_5" ARG BLAZEGRAPH_FILE="blazegraph.war" diff --git a/cantaloupe/Dockerfile b/cantaloupe/Dockerfile index e3f23f53..c8047a31 100644 --- a/cantaloupe/Dockerfile +++ b/cantaloupe/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/cantaloupe +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=cantaloupe packageName=cantaloupe-project/cantaloupe ARG CANTALOUPE_VERSION=5.0.6 diff --git a/code-server/Dockerfile b/code-server/Dockerfile index fd0f1687..d4cf172a 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -2,6 +2,9 @@ FROM nodejs FROM drupal +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/code-server +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=alpine-pkg-glibc packageName=sgerrand/alpine-pkg-glibc diff --git a/crayfish/Dockerfile b/crayfish/Dockerfile index 05503365..9190f42d 100644 --- a/crayfish/Dockerfile +++ b/crayfish/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM nginx +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/crayfish +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + # When updating this commit also update the lock files in rootfs/var/www/crayfish. ARG TARGETARCH ARG COMMIT=6ba190c3ffebabb83e977c6515ecfd022692f6e5 diff --git a/crayfits/Dockerfile b/crayfits/Dockerfile index 8210dcd4..474af8e8 100644 --- a/crayfits/Dockerfile +++ b/crayfits/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM crayfish +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/crayfits +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 8000 diff --git a/drupal/Dockerfile b/drupal/Dockerfile index f455f76a..84f0bf51 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM nginx +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/drupal +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 80 diff --git a/fcrepo6/Dockerfile b/fcrepo6/Dockerfile index 587b5e5c..ba95c130 100644 --- a/fcrepo6/Dockerfile +++ b/fcrepo6/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM tomcat +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/fcrepo6 +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=fcrepo packageName=fcrepo/fcrepo diff --git a/fits/Dockerfile b/fits/Dockerfile index 9f594378..386c54c7 100644 --- a/fits/Dockerfile +++ b/fits/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM tomcat +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/fits +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=fits-servlet packageName=harvard-lts/FITSservlet diff --git a/handle/Dockerfile b/handle/Dockerfile index e7e19226..129da8b4 100644 --- a/handle/Dockerfile +++ b/handle/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/handle +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH ARG HANDLE_VERSION=9.3.1 ARG HANDLE_FILE="handle-${HANDLE_VERSION}-distribution.tar.gz" diff --git a/homarus/Dockerfile b/homarus/Dockerfile index e9914797..36142a14 100644 --- a/homarus/Dockerfile +++ b/homarus/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM crayfish +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/homarus +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 8000 diff --git a/houdini/Dockerfile b/houdini/Dockerfile index 803c4d05..a17b191b 100644 --- a/houdini/Dockerfile +++ b/houdini/Dockerfile @@ -2,6 +2,9 @@ FROM imagemagick FROM crayfish +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/houdini +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 8000 diff --git a/hypercube/Dockerfile b/hypercube/Dockerfile index 552bc555..3d1321c4 100644 --- a/hypercube/Dockerfile +++ b/hypercube/Dockerfile @@ -2,6 +2,9 @@ FROM leptonica FROM crayfish AS hypercube +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/hypercube +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 8000 diff --git a/java/Dockerfile b/java/Dockerfile index 51ba7add..4f564184 100644 --- a/java/Dockerfile +++ b/java/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM base +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/java +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # Install packages and tools required by all downstream images. diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index b6072d60..7f147f24 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM base +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/mariadb +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 3306 @@ -27,7 +30,7 @@ RUN --mount=type=cache,id=mariadb-apk-${TARGETARCH},sharing=locked,target=/var/c # hardware. ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=600000 -ENV \ +ENV \ # Default Mariadb value of 16 MB (bytes) MYSQL_MAX_ALLOWED_PACKET=16777216 \ MYSQL_TRANSACTION_ISOLATION=READ-COMMITTED diff --git a/matomo/Dockerfile b/matomo/Dockerfile index 783ae29b..94c0039d 100644 --- a/matomo/Dockerfile +++ b/matomo/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM nginx +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/matomo +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH ARG MATOMO_VERSION="5.0.3" diff --git a/milliner/Dockerfile b/milliner/Dockerfile index 1bfead93..d4578db3 100644 --- a/milliner/Dockerfile +++ b/milliner/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM crayfish +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/milliner +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 8000 diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 459c24fc..2f35bb9c 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM base +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/nginx +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-releases depName=custom-composer packageName=composer/composer ARG COMPOSER_VERSION=2.8.4 diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile index 15e5bb76..b27e2421 100644 --- a/postgresql/Dockerfile +++ b/postgresql/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM base +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/postgresql +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH EXPOSE 5432 diff --git a/riprap/Dockerfile b/riprap/Dockerfile index b6161626..e6e9187a 100644 --- a/riprap/Dockerfile +++ b/riprap/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM nginx as download +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/riprap +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH ARG COMMIT=6e38c75c1af3ee92a4fc54f8b8e36bc294812421 ARG FILE=${COMMIT}.tar.gz diff --git a/solr/Dockerfile b/solr/Dockerfile index e5df810f..064e467b 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/solr +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-tags depName=apache-solr packageName=apache/solr ARG SOLR_VERSION=9.7.0 diff --git a/test/Dockerfile b/test/Dockerfile index ed0a5564..1dff7b81 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM drupal +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/test +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=git-refs depName=islandora-starter-site packageName=https://github.com/islandora-devops/islandora-starter-site branch=main ARG COMMIT=082032e325509950b3df535fd1630b5492af4f36 diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile index aa863857..d5dc42f3 100644 --- a/tomcat/Dockerfile +++ b/tomcat/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1.5.1 FROM java +LABEL org.opencontainers.image.source=https://github.com/Islandora-DevOps/isle-buildkit/tree/main/tomcat +LABEL org.opencontainers.image.url=https://github.com/Islandora-DevOps/isle-buildkit/ + ARG TARGETARCH # renovate: datasource=github-tags depName=apache-tomcat packageName=apache/tomcat ARG TOMCAT_VERSION=9.0.98