Use args for versions, and checksums (#256)

Co-authored-by: Nigel Banks <[email protected]:w>

activemq/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG ACTIVEMQ_VERSION="5.14.5"
+ARG ACTIVEMQ_FILE_SHA256="a4bc310ccb3fb439d0ba159e43f0e08e8073caf050c95e5e07c1a6d5f3f9a86e"
+
 RUN --mount=type=cache,id=activemq-downloads,sharing=locked,target=/opt/downloads \
-    ACTIVEMQ_VERSION="5.14.5" && \
     ACTIVEMQ_FILE="apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz" && \
     ACTIVEMQ_URL="https://archive.apache.org/dist/activemq/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}" && \
-    ACTIVEMQ_FILE_SHA256="a4bc310ccb3fb439d0ba159e43f0e08e8073caf050c95e5e07c1a6d5f3f9a86e" && \
     download.sh --url "${ACTIVEMQ_URL}" --sha256 "${ACTIVEMQ_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name activemq \

alpaca/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/karaf:${tag} AS download
 
+ARG ALPACA_VERSION=1.0.5
+ARG ACTIVEMQ_VERSION=5.15.0
+ARG CAMEL_VERSION=2.20.4
+
 # Install common features and repos
 RUN bin/start && \
-    ALPACA_VERSION=1.0.5 && \
-    ACTIVEMQ_VERSION=5.15.0 && \
-    CAMEL_VERSION=2.20.4 && \
     bin/client -r 10 -d 5  "feature:repo-add mvn:ca.islandora.alpaca/islandora-karaf/${ALPACA_VERSION}/xml/features" && \
     bin/client -r 10 -d 5  "feature:repo-add mvn:org.apache.activemq/activemq-karaf/${ACTIVEMQ_VERSION}/xml/features" && \
     bin/client -r 10 -d 5  "feature:repo-add mvn:org.apache.camel.karaf/apache-camel/${CAMEL_VERSION}/xml/features" && \

base/Dockerfile

@@ -31,17 +31,20 @@ ARG TARGETARCH
 
 COPY --from=download /usr/local/bin/*.sh /usr/local/bin
 
+ARG S6_VERSION="2.2.0.3"
+ARG S6_AMD64_SHA256="a7076cf205b331e9f8479bbb09d9df77dbb5cd8f7d12e9b74920902e0c16dd98"
+ARG S6_ARM64_SHA256="84f585a100b610124bb80e441ef2dc2d68ac2c345fd393d75a6293e0951ccfc5"
+
 # Install s6
 RUN --mount=type=cache,id=base-downloads,sharing=locked,from=download,target=/opt/downloads \
     if [ "${TARGETARCH}" = "arm64" ]; then \
         S6_FILE="s6-overlay-aarch64.tar.gz"; \
-        S6_SHA256="84f585a100b610124bb80e441ef2dc2d68ac2c345fd393d75a6293e0951ccfc5"; \
+        S6_SHA256="${S6_ARM64_SHA256}"; \
     fi; \
     if [ "${TARGETARCH}" = "amd64" ]; then \
         S6_FILE="s6-overlay-amd64.tar.gz"; \
-        S6_SHA256="a7076cf205b331e9f8479bbb09d9df77dbb5cd8f7d12e9b74920902e0c16dd98"; \
+        S6_SHA256="${S6_AMD64_SHA256}"; \
     fi; \
-    S6_VERSION="2.2.0.3" && \
     S6_URL="https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}/${S6_FILE}" && \
     download.sh --url "${S6_URL}" --sha256 "${S6_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     tar -xzf "${DOWNLOAD_CACHE_DIRECTORY}/${S6_FILE}" -C /  && \

blazegraph/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG BLAZEGRAPH_VERSION="CANDIDATE_2_1_5"
+ARG BLAZEGRAPH_SHA256="b22f1a1aa8e536443db9a57da63720813374ef59e4021cfa9ad0e98f9a420e85"
+
 RUN --mount=type=cache,id=blazegraph-downloads,sharing=locked,target=/opt/downloads \
-    BLAZEGRAPH_VERSION="CANDIDATE_2_1_5" && \
     BLAZEGRAPH_FILE="blazegraph.war" && \
     BLAZEGRAPH_URL="https://github.com/blazegraph/database/releases/download/BLAZEGRAPH_RELEASE_${BLAZEGRAPH_VERSION}/${BLAZEGRAPH_FILE}" && \
-    BLAZEGRAPH_SHA256="b22f1a1aa8e536443db9a57da63720813374ef59e4021cfa9ad0e98f9a420e85" && \
     download.sh --url "${BLAZEGRAPH_URL}" --sha256 "${BLAZEGRAPH_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-war-into-tomcat.sh --name "bigdata" --file "${DOWNLOAD_CACHE_DIRECTORY}/${BLAZEGRAPH_FILE}"
 

cantaloupe/Dockerfile

@@ -4,11 +4,12 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG CANTALOUPE_VERSION="4.1.5"
+ARG CANTALOUPE_SHA256="a117061727f1de1c0f514659ec537c080a7f540199643244d1c9cbb50d73027d"
+
 RUN --mount=type=cache,id=cantaloupe-downloads,sharing=locked,target=/opt/downloads \
-    CANTALOUPE_VERSION="4.1.5" && \
     CANTALOUPE_FILE="cantaloupe-${CANTALOUPE_VERSION}.zip" && \
     CANTALOUPE_URL="https://github.com/medusa-project/cantaloupe/releases/download/v${CANTALOUPE_VERSION}/${CANTALOUPE_FILE}" && \
-    CANTALOUPE_SHA256="a117061727f1de1c0f514659ec537c080a7f540199643244d1c9cbb50d73027d" && \
     download.sh --url "${CANTALOUPE_URL}" --sha256 "${CANTALOUPE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     unzip "${DOWNLOAD_CACHE_DIRECTORY}/${CANTALOUPE_FILE}" -d /tmp && \
     CANTALOUPE_UNPACKED="${CANTALOUPE_FILE%.zip}" && \

composer/Dockerfile

@@ -4,12 +4,13 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download 
 
+ARG COMPOSER_VERSION="2.0.12"
+ARG COMPOSER_SHA256="82ea8c1537cfaceb7e56f6004c7ccdf99ddafce7237c07374d920e635730a631"
+
 # https://getcomposer.org/download/
 RUN --mount=type=cache,id=download-downloads,sharing=locked,target=/opt/downloads \
-    COMPOSER_VERSION="2.0.12" && \
     COMPOSER_FILE="composer.phar" && \
     COMPOSER_URL="https://getcomposer.org/download/${COMPOSER_VERSION}/${COMPOSER_FILE}" && \
-    COMPOSER_SHA256="82ea8c1537cfaceb7e56f6004c7ccdf99ddafce7237c07374d920e635730a631" && \
     download.sh --url "${COMPOSER_URL}" --sha256 "${COMPOSER_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${COMPOSER_FILE}" /usr/bin/composer && \
     chmod a+x /usr/bin/composer

drupal/Dockerfile

@@ -4,11 +4,12 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG DRUSH_VERSION="0.6.0"
+ARG DRUSH_SHA256="c3f32a800a2f18470b0010cd71c49e49ef5c087f8131eecfe9b686dc1f3f3d4e"
+
 RUN --mount=type=cache,id=drupal-downloads,sharing=locked,target=/opt/downloads \
-    DRUSH_VERSION="0.6.0" && \
     DRUSH_FILE="drush.phar" && \
     DRUSH_URL="https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_VERSION}/${DRUSH_FILE}" && \
-    DRUSH_SHA256="c3f32a800a2f18470b0010cd71c49e49ef5c087f8131eecfe9b686dc1f3f3d4e" && \
     download.sh --url "${DRUSH_URL}" --sha256 "${DRUSH_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${DRUSH_FILE}" /usr/bin/drush && \
     chmod a+x /usr/bin/drush

fcrepo/Dockerfile

@@ -3,24 +3,25 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG FCREPO_VERSION="5.1.0"
+ARG FCREPO_SHA256="fdcb43cfd1468a84ddb89c20e4f4c7f54476ab9a24f69beb335d26f2b58ecec5"
+ARG SYN_VERSION="1.1.0"
+ARG SYN_SHA256="bcad5f872930b1bcc9ea4a176c60e22683297121357336769a21ead9fadcbbd5"
+ARG IMPORT_EXPORT_VERSION="1.0.1"
+ARG IMPORT_EXPORT_SHA256="89c579d1223c8f3c0da60c4309a06e47f5919c51929d976e60ea525c60cb33d1"
+
 RUN --mount=type=cache,id=fcrepo-downloads,sharing=locked,target=/opt/downloads \
-    FCREPO_VERSION="5.1.0" && \
     FCREPO_FILE="fcrepo-webapp-${FCREPO_VERSION}.war" && \
     FCREPO_URL="https://github.com/fcrepo4/fcrepo4/releases/download/fcrepo-${FCREPO_VERSION}/${FCREPO_FILE}" && \
-    FCREPO_SHA256="fdcb43cfd1468a84ddb89c20e4f4c7f54476ab9a24f69beb335d26f2b58ecec5" && \
     download.sh --url "${FCREPO_URL}" --sha256 "${FCREPO_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-war-into-tomcat.sh --name "fcrepo" --file "${DOWNLOAD_CACHE_DIRECTORY}/${FCREPO_FILE}" && \
-    SYN_VERSION="1.1.0" && \
     SYN_FILE="islandora-syn-${SYN_VERSION}-all.jar" && \
     SYN_URL="https://github.com/Islandora-CLAW/Syn/releases/download/v${SYN_VERSION}/${SYN_FILE}" && \
-    SYN_SHA256="bcad5f872930b1bcc9ea4a176c60e22683297121357336769a21ead9fadcbbd5" && \
     download.sh --url "${SYN_URL}" --sha256 "${SYN_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     mkdir -p /opt/tomcat/lib && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${SYN_FILE}" /opt/tomcat/lib && \
-    IMPORT_EXPORT_VERSION="1.0.1" && \
     IMPORT_EXPORT_FILE="fcrepo-import-export-${IMPORT_EXPORT_VERSION}.jar" && \
     IMPORT_EXPORT_URL="https://github.com/fcrepo-exts/fcrepo-import-export/releases/download/fcrepo-import-export-${IMPORT_EXPORT_VERSION}/${IMPORT_EXPORT_FILE}" && \
-    IMPORT_EXPORT_SHA256="89c579d1223c8f3c0da60c4309a06e47f5919c51929d976e60ea525c60cb33d1" && \
     download.sh --url "${IMPORT_EXPORT_URL}" --sha256 "${IMPORT_EXPORT_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${IMPORT_EXPORT_FILE}" /opt/tomcat
 

fcrepo6/Dockerfile

@@ -4,30 +4,31 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG FCREPO_VERSION="6.2.0"
+ARG FCREPO_SHA256="edd4cb53366d6bd06d383f41de5d687000abaeb97b9052d8476fe8e22f8c51ee"
+ARG SYN_VERSION="1.1.0"
+ARG SYN_SHA256="bcad5f872930b1bcc9ea4a176c60e22683297121357336769a21ead9fadcbbd5"
+ARG IMPORT_EXPORT_VERSION="1.0.1"
+ARG IMPORT_EXPORT_SHA256="89c579d1223c8f3c0da60c4309a06e47f5919c51929d976e60ea525c60cb33d1"
+ARG UPGRADE_UTILS_VERSION="6.0.0-beta-1"
+ARG UPGRADE_UTILS_SHA256="e8a0bbbabca45ff95b2ffb5c62cad49e02548bc116b80f2747d5215f80d02a0a"
+
 RUN --mount=type=cache,id=fcrepo6-downloads,sharing=locked,target=/opt/downloads \
-    FCREPO_VERSION="6.2.0" && \
     FCREPO_FILE="fcrepo-webapp-${FCREPO_VERSION}.war" && \
     FCREPO_URL="https://github.com/fcrepo/fcrepo/releases/download/fcrepo-${FCREPO_VERSION}/${FCREPO_FILE}" && \
-    FCREPO_SHA256="edd4cb53366d6bd06d383f41de5d687000abaeb97b9052d8476fe8e22f8c51ee" && \
     download.sh --url "${FCREPO_URL}" --sha256 "${FCREPO_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-war-into-tomcat.sh --name "fcrepo" --file "${DOWNLOAD_CACHE_DIRECTORY}/${FCREPO_FILE}" && \
-    SYN_VERSION="1.1.0" && \
     SYN_FILE="islandora-syn-${SYN_VERSION}-all.jar" && \
     SYN_URL="https://github.com/Islandora-CLAW/Syn/releases/download/v${SYN_VERSION}/${SYN_FILE}" && \
-    SYN_SHA256="bcad5f872930b1bcc9ea4a176c60e22683297121357336769a21ead9fadcbbd5" && \
     download.sh --url "${SYN_URL}" --sha256 "${SYN_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     mkdir -p /opt/tomcat/lib && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${SYN_FILE}" /opt/tomcat/lib && \
-    IMPORT_EXPORT_VERSION="1.0.1" && \
     IMPORT_EXPORT_FILE="fcrepo-import-export-${IMPORT_EXPORT_VERSION}.jar" && \
     IMPORT_EXPORT_URL="https://github.com/fcrepo-exts/fcrepo-import-export/releases/download/fcrepo-import-export-${IMPORT_EXPORT_VERSION}/${IMPORT_EXPORT_FILE}" && \
-    IMPORT_EXPORT_SHA256="89c579d1223c8f3c0da60c4309a06e47f5919c51929d976e60ea525c60cb33d1" && \
     download.sh --url "${IMPORT_EXPORT_URL}" --sha256 "${IMPORT_EXPORT_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${IMPORT_EXPORT_FILE}" /opt/tomcat && \
-    UPGRADE_UTILS_VERSION="6.0.0-beta-1" && \
     UPGRADE_UTILS_FILE="fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}.jar" && \
     UPGRADE_UTILS_URL="https://github.com/fcrepo-exts/fcrepo-upgrade-utils/releases/download/fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}/${UPGRADE_UTILS_FILE}" && \
-    UPGRADE_UTILS_SHA256="e8a0bbbabca45ff95b2ffb5c62cad49e02548bc116b80f2747d5215f80d02a0a" && \
     download.sh --url "${UPGRADE_UTILS_URL}" --sha256 "${UPGRADE_UTILS_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     cp "${DOWNLOAD_CACHE_DIRECTORY}/${UPGRADE_UTILS_FILE}" /opt/tomcat
 

fits/Dockerfile

@@ -4,17 +4,18 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG FITSSERVLET_VERSION="1.2.3"
+ARG FITSSERVLET_SHA256="e98450a1617c491976966a307da8b9c783c83e9e1a79bca9dbd9bc6c9a7226cd"
+ARG FITS_VERSION="1.5.5"
+ARG FITS_SHA256="48be7ad9f27d9cc0b52c63f1aea1a3814e1b6996ca4e8467e77772c187ac955c"
+
 RUN --mount=type=cache,id=fits-downloads,sharing=locked,target=/opt/downloads \
-    FITSSERVLET_VERSION="1.2.3" && \
     FITSSERVLET_FILE="fits-service-${FITSSERVLET_VERSION}.war" && \
     FITSSERVLET_URL="https://github.com/harvard-lts/FITSservlet/releases/download/${FITSSERVLET_VERSION}/${FITSSERVLET_FILE}" && \
-    FITSSERVLET_SHA256="e98450a1617c491976966a307da8b9c783c83e9e1a79bca9dbd9bc6c9a7226cd" && \
     download.sh --url "${FITSSERVLET_URL}" --sha256 "${FITSSERVLET_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-war-into-tomcat.sh --name "fits" --file "${DOWNLOAD_CACHE_DIRECTORY}/${FITSSERVLET_FILE}" && \
-    FITS_VERSION="1.5.5" && \
     FITS_FILE="fits-${FITS_VERSION}.zip" && \
     FITS_URL="https://github.com/harvard-lts/fits/releases/download/${FITS_VERSION}/${FITS_FILE}" && \
-    FITS_SHA256="48be7ad9f27d9cc0b52c63f1aea1a3814e1b6996ca4e8467e77772c187ac955c" && \
     mkdir /opt/fits && \
     download.sh --url "${FITS_URL}" --sha256 "${FITS_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     unzip "${DOWNLOAD_CACHE_DIRECTORY}/${FITS_FILE}" -d /opt/fits && \

handle/Dockerfile

@@ -3,23 +3,24 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG HANDLE_VERSION="9.3.0"
+ARG HANDLE_FILE_SHA256="7bbf155842b098df9eb3e6e24778be23bc74365cf0f2b1b2acb0ae111a54bdaf"
+ARG MYSQL_DRIVER_VERSION="8.0.22"
+ARG MYSQL_DRIVER_FILE_SHA256="10e4bbe3269a26a6ee95b6ad8746632b3a4c59cb99320f52b65f455d60db7a62"
+ARG POSTGRES_DRIVER_VERSION="42.2.18"
+ARG POSTGRES_DRIVER_FILE_SHA256="0c891979f1eb2fe44432da114d09760b5063dad9e669ac0ac6b0b6bfb91bb3ba"
+
 # Download Handle & the java mysql driver
 # And install them into /opt/handle directory
 RUN --mount=type=cache,id=handle-downloads,sharing=locked,target=/opt/downloads \
-    HANDLE_VERSION="9.3.0" && \
     HANDLE_FILE="handle-${HANDLE_VERSION}-distribution.tar.gz" && \
     HANDLE_URL="http://handle.net/hnr-source/${HANDLE_FILE}" && \
-    HANDLE_FILE_SHA256="7bbf155842b098df9eb3e6e24778be23bc74365cf0f2b1b2acb0ae111a54bdaf" && \
     download.sh --url "${HANDLE_URL}" --sha256 "${HANDLE_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
-    MYSQL_DRIVER_VERSION=8.0.22 && \
     MYSQL_DRIVER_FILE="mysql-connector-java-${MYSQL_DRIVER_VERSION}.tar.gz" && \
     MYSQL_DRIVER_URL="https://dev.mysql.com/get/Downloads/Connector-J/${MYSQL_DRIVER_FILE}" && \
-    MYSQL_DRIVER_FILE_SHA256="10e4bbe3269a26a6ee95b6ad8746632b3a4c59cb99320f52b65f455d60db7a62" && \
     download.sh --url "${MYSQL_DRIVER_URL}" --sha256 "${MYSQL_DRIVER_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
-    POSTGRES_DRIVER_VERSION=42.2.18 && \
     POSTGRES_DRIVER_FILE="postgresql-${POSTGRES_DRIVER_VERSION}.jar" && \
     POSTGRES_DRIVER_URL="https://jdbc.postgresql.org/download/${POSTGRES_DRIVER_FILE}" && \
-    POSTGRES_DRIVER_FILE_SHA256="0c891979f1eb2fe44432da114d09760b5063dad9e669ac0ac6b0b6bfb91bb3ba" && \
     download.sh --url "${POSTGRES_DRIVER_URL}" --sha256 "${POSTGRES_DRIVER_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-service.sh --name "handle" --file "${DOWNLOAD_CACHE_DIRECTORY}/${HANDLE_FILE}" doc handle-9.3.0-src.zip jeUpgradeTool && \
     tar -xzf "${DOWNLOAD_CACHE_DIRECTORY}/${MYSQL_DRIVER_FILE}" -C /opt/handle/lib "mysql-connector-java-${MYSQL_DRIVER_VERSION}/${MYSQL_DRIVER_FILE%%.tar.gz}.jar" --strip-components 1 && \

karaf/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG KARAF_VERSION="4.0.8"
+ARG KARAF_FILE_SHA256="67e555e3896fbe87d23ceec008898bb33133f36b48d7e5ede363c214a54e7d2a"
+
 RUN --mount=type=cache,id=karaf-downloads,sharing=locked,target=/opt/downloads \
-    KARAF_VERSION="4.0.8" && \
     KARAF_FILE="apache-karaf-${KARAF_VERSION}.tar.gz" && \
     KARAF_URL="https://archive.apache.org/dist/karaf/${KARAF_VERSION}/${KARAF_FILE}" && \
-    KARAF_FILE_SHA256="67e555e3896fbe87d23ceec008898bb33133f36b48d7e5ede363c214a54e7d2a" && \
     download.sh --url "${KARAF_URL}" --sha256 "${KARAF_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh -e \
         --name karaf \

matomo/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG MATOMO_VERSION="3.13.5"
+ARG MATOMO_FILE_SHA256="b9af7dabc6e727762cef58cecd16de7bc75886f8dacc910070632d83a44c2aad"
+
 RUN --mount=type=cache,id=matomo-downloads,sharing=locked,target=/opt/downloads \
-    MATOMO_VERSION="3.13.5" && \
     MATOMO_FILE="matomo-${MATOMO_VERSION}.tar.gz" && \
     MATOMO_URL="https://builds.matomo.org/${MATOMO_FILE}" && \
-    MATOMO_FILE_SHA256="b9af7dabc6e727762cef58cecd16de7bc75886f8dacc910070632d83a44c2aad" && \
     download.sh --url "${MATOMO_URL}" --sha256 "${MATOMO_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     tar -xzf "${DOWNLOAD_CACHE_DIRECTORY}/${MATOMO_FILE}" -C /opt && \
     rm "/opt/How to install Matomo.html"

riprap/Dockerfile

@@ -4,9 +4,10 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/composer:${tag} AS composer
 
+ARG COMMIT="7d7cae2d09dec20caa3c3f5752434af32401819e"
+
 RUN --mount=type=cache,id=riprap-composer,sharing=locked,target=/root/.composer/cache \
     --mount=type=cache,id=riprap-downloads,sharing=locked,target=/opt/downloads \
-    COMMIT=7d7cae2d09dec20caa3c3f5752434af32401819e && \
     git-clone-cached.sh \
         --url https://github.com/mjordan/riprap.git \
         --cache-dir "${DOWNLOAD_CACHE_DIRECTORY}" \

solr/Dockerfile

@@ -3,11 +3,12 @@ ARG repository=local
 ARG tag=latest
 FROM --platform=$BUILDPLATFORM ${repository}/download:${tag} AS download
 
+ARG SOLR_VERSION="7.1.0"
+ARG SOLR_FILE_SHA256="5cd25cc2634e47efbb529658d6ddd406a7cd1b211affa26563a28db2d80b8133"
+
 RUN --mount=type=cache,id=solr-downloads,sharing=locked,target=/opt/downloads \
-    SOLR_VERSION="7.1.0" && \
     SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \
     SOLR_URL="https://archive.apache.org/dist/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \
-    SOLR_FILE_SHA256="5cd25cc2634e47efbb529658d6ddd406a7cd1b211affa26563a28db2d80b8133" && \
     download.sh --url "${SOLR_URL}" --sha256 "${SOLR_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name solr \

tomcat/Dockerfile

@@ -4,11 +4,12 @@ ARG tag=latest
 ARG alpine=3.15.0
 FROM --platform=$BUILDPLATFORM ${repository}/java:${tag} AS download
 
+ARG TOMCAT_VERSION="9.0.58"
+ARG TOMCAT_FILE_SHA256="a7895a9f425dd57fba5a1e8685d43754d3ecfe05de80e93bfd245ca8313cc7c1"
+
 RUN --mount=type=cache,id=tomcat-downloads,sharing=locked,target=/opt/downloads \
-    TOMCAT_VERSION="9.0.58" && \
     TOMCAT_FILE="apache-tomcat-${TOMCAT_VERSION}.tar.gz" && \
     TOMCAT_URL="https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/${TOMCAT_FILE}" && \
-    TOMCAT_FILE_SHA256="a7895a9f425dd57fba5a1e8685d43754d3ecfe05de80e93bfd245ca8313cc7c1" && \
     download.sh --url "${TOMCAT_URL}" --sha256 "${TOMCAT_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name tomcat \