From 27f7b9832530ad3c1d0a1d014febc47aeb8d8ec1 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Wed, 31 Aug 2022 12:11:24 -0400
Subject: [PATCH 01/11] update Solr to 8.11.2

---
 solr/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/Dockerfile b/solr/Dockerfile
index a6fcaf58..6244b1d9 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -3,16 +3,16 @@ FROM local/java:latest
 
 RUN --mount=id=downloads,type=cache,target=/opt/downloads \
     DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \
-    SOLR_VERSION="8.11.1" && \
+    SOLR_VERSION="8.11.2" && \
     SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \
     SOLR_URL="https://dlcdn.apache.org/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \
-    SOLR_FILE_SHA256="9ec540cbd8e45f3d15a6b615a22939f5e6242ca81099951a47d3c082c79866a9" && \
-    SOLR_SIG_SHA256="6a1eca93d0d0a80647cb60063f5e46347350b03a0f75b6a662d1b0a4746dabba" && \
+    SOLR_FILE_SHA256="b7f0dc3f1f2cc4a15d1d6e5a680b3681ea0eb5dc88295d30a97e943a94b23f8a" && \
+    SOLR_SIG_SHA256="d1f50d28b71950e5f7848f28dd484b010212b28300b449225c625611e8738d2b" && \
     download.sh --url "${SOLR_URL}" --sha256 "${SOLR_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     download.sh --url "${SOLR_URL}.asc" --sha256 "${SOLR_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name solr \
-        --key "CFCE5FBB920C3C745CEEE084C38FF5EC3FCFDB3E" \
+        --key "86EDB9C33B8517228E88A8F93E48C0C6EF362B9E" \
         --file "${DOWNLOAD_CACHE_DIRECTORY}/${SOLR_FILE}" \ 
         docs example licenses server/solr/configsets
 

From 7a17d8fa93e573cbefb312a4f1a8d25da890aee9 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Wed, 31 Aug 2022 14:03:03 -0400
Subject: [PATCH 02/11] Fix Solr update

---
 solr/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/Dockerfile b/solr/Dockerfile
index 6244b1d9..49273789 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -6,13 +6,13 @@ RUN --mount=id=downloads,type=cache,target=/opt/downloads \
     SOLR_VERSION="8.11.2" && \
     SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \
     SOLR_URL="https://dlcdn.apache.org/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \
-    SOLR_FILE_SHA256="b7f0dc3f1f2cc4a15d1d6e5a680b3681ea0eb5dc88295d30a97e943a94b23f8a" && \
-    SOLR_SIG_SHA256="d1f50d28b71950e5f7848f28dd484b010212b28300b449225c625611e8738d2b" && \
+    SOLR_FILE_SHA256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6" && \
+    SOLR_SIG_SHA256="1dc449783b89ae9287d1e31db0514d62aeb6edce199d541a29303e8d5c98d31e" && \
     download.sh --url "${SOLR_URL}" --sha256 "${SOLR_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     download.sh --url "${SOLR_URL}.asc" --sha256 "${SOLR_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name solr \
-        --key "86EDB9C33B8517228E88A8F93E48C0C6EF362B9E" \
+        --key "3E48C0C6EF362B9E" \
         --file "${DOWNLOAD_CACHE_DIRECTORY}/${SOLR_FILE}" \ 
         docs example licenses server/solr/configsets
 

From 689d20b8004f3a146ec83145fb08a08ef63cf004 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Wed, 31 Aug 2022 17:02:13 -0400
Subject: [PATCH 03/11] Chullo error correction

Not able to test locally.
---
 drupal/rootfs/etc/cont-init.d/99-custom-setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drupal/rootfs/etc/cont-init.d/99-custom-setup.sh b/drupal/rootfs/etc/cont-init.d/99-custom-setup.sh
index d1807e81..37244b9f 100644
--- a/drupal/rootfs/etc/cont-init.d/99-custom-setup.sh
+++ b/drupal/rootfs/etc/cont-init.d/99-custom-setup.sh
@@ -149,8 +149,12 @@ function main {
   # Install Composer modules if necessary.
   if [ -n "${DRUPAL_INSTANCE}" ] && [ "${DRUPAL_INSTANCE}" != "dev" ] ;
   then
+    # 9.4 Temp fix
+    COMPOSER_MEMORY_LIMIT=-1 composer config repositories.islandora/chullo '{"type": "git", "url": "https://github.com/Islandora/chullo.git", "reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02", "name": "islandora/chullo","version": "dev-dev"}'
     COMPOSER_MEMORY_LIMIT=-1 composer install 
   else
+    # 9.4 Temp fix
+    COMPOSER_MEMORY_LIMIT=-1 composer config repositories.islandora/chullo '{"type": "git", "url": "https://github.com/Islandora/chullo.git", "reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02", "name": "islandora/chullo","version": "dev-dev"}'
     COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-install=auto
   fi
 

From 104d0880a4a81d4463ef32738108a099dcc69153 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 1 Sep 2022 09:43:23 -0400
Subject: [PATCH 04/11] Modify the gpg key check

---
 solr/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/Dockerfile b/solr/Dockerfile
index 49273789..13786087 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -12,7 +12,7 @@ RUN --mount=id=downloads,type=cache,target=/opt/downloads \
     download.sh --url "${SOLR_URL}.asc" --sha256 "${SOLR_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name solr \
-        --key "3E48C0C6EF362B9E" \
+        --key "86EDB9C33B8517228E88A8F93E48C0C6EF362B9E" \
         --file "${DOWNLOAD_CACHE_DIRECTORY}/${SOLR_FILE}" \ 
         docs example licenses server/solr/configsets
 

From bc942dd345c4338f16f6c323458a176a91b0fd8c Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 1 Sep 2022 13:47:21 -0400
Subject: [PATCH 05/11] Temp fix Chullo for 9_4

---
 demo/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/demo/Dockerfile b/demo/Dockerfile
index 0fc62ab9..6a15ded6 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -14,6 +14,9 @@ RUN --mount=type=cache,target=/root/.composer/cache \
         /var/www/drupal \
     && \
     cd /var/www/drupal && \
+    composer config repositories.1 '{"name": "islandora/chullo","type": "git","url": "https://github.com/Islandora/chullo.git","trunk-path" : "dev-dev#a7c1e051eab2a5077eaf5db2649201fa775c5a02"}' && \
+    composer config repositories.1 --json '{"type": "package","package": {"name": "islandora/chullo","version": "dev-dev","type": "drupal-module","source": {"url": "https://github.com/Islandora/chullo.git","type": "git","reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02"}}}' && \
+    composer config --no-plugins allow-plugins.cweagans/composer-patches true
     composer require --update-no-dev -- \
         drupal/admin_toolbar:^2.0 \
         drupal/console:~1.0 \
@@ -32,7 +35,7 @@ RUN --mount=type=cache,target=/root/.composer/cache \
         islandora/carapace:dev-8.x-3.x \
         islandora/islandora_defaults:dev-8.x-1.x \
         zaporylie/composer-drupal-optimizations:^1.0 \
-    && \
+        islandora/chullo:dev-dev && \
     mkdir -p /var/www/drupal/web/libraries && \
     MASONRY_VERSION="3.3.2" && \
     MASONRY_FILE="v${MASONRY_VERSION}.zip" && \

From 66eafb76b28aa9287ae2ca6afba4b85c5d9fff4d Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 1 Sep 2022 15:06:42 -0400
Subject: [PATCH 06/11] composer plugins for demo and gpg key server correction

---
 demo/Dockerfile   | 6 +++++-
 matomo/Dockerfile | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/demo/Dockerfile b/demo/Dockerfile
index 6a15ded6..118ab01a 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -16,7 +16,11 @@ RUN --mount=type=cache,target=/root/.composer/cache \
     cd /var/www/drupal && \
     composer config repositories.1 '{"name": "islandora/chullo","type": "git","url": "https://github.com/Islandora/chullo.git","trunk-path" : "dev-dev#a7c1e051eab2a5077eaf5db2649201fa775c5a02"}' && \
     composer config repositories.1 --json '{"type": "package","package": {"name": "islandora/chullo","version": "dev-dev","type": "drupal-module","source": {"url": "https://github.com/Islandora/chullo.git","type": "git","reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02"}}}' && \
-    composer config --no-plugins allow-plugins.cweagans/composer-patches true
+    composer config --no-plugins allow-plugins.cweagans/composer-patches true && \
+    composer config --no-plugins allow-plugins.composer/installers true && \
+    composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true && \
+    composer config --no-plugins allow-plugins.zaporylie/composer-drupal-optimizations true && \
+    composer config --no-plugins allow-plugins.drupal/console-extend-plugin true && \
     composer require --update-no-dev -- \
         drupal/admin_toolbar:^2.0 \
         drupal/console:~1.0 \
diff --git a/matomo/Dockerfile b/matomo/Dockerfile
index ec880803..e6a56400 100644
--- a/matomo/Dockerfile
+++ b/matomo/Dockerfile
@@ -10,7 +10,7 @@ RUN --mount=id=downloads,type=cache,target=/opt/downloads \
     MATOMO_SIG_SHA256="7e33ba4ea7f44370157832940d177d524b21192985b03e795e9f05f037b0c453" && \
     download.sh --url "${MATOMO_URL}" --sha256 "${MATOMO_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     download.sh --url "${MATOMO_URL}.asc" --sha256 "${MATOMO_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 814E346FA01A20DBB04B6807B5DBD5925590A237 && \
+    gpg --keyserver keyserver.ubuntu.com --recv-keys 814E346FA01A20DBB04B6807B5DBD5925590A237 && \
     gpg --verify "${DOWNLOAD_CACHE_DIRECTORY}/${MATOMO_FILE}.asc" "${DOWNLOAD_CACHE_DIRECTORY}/${MATOMO_FILE}" && \
     tar -xzf "${DOWNLOAD_CACHE_DIRECTORY}/${MATOMO_FILE}" -C /opt && \
     chown -R nginx:nginx /opt/matomo && \

From e2294689101193ae2ad5fa6ac63f1c6cf0e99f05 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 1 Sep 2022 21:08:54 -0400
Subject: [PATCH 07/11] Add new tmp directory

---
 demo/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/Dockerfile b/demo/Dockerfile
index 118ab01a..3a3f1977 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -66,6 +66,7 @@ RUN --mount=type=cache,target=/root/.composer/cache \
     mkdir -p /var/www/drupal/web/sites/default/files/library-definitions && \
     cp /var/www/drupal/web/modules/contrib/openseadragon/openseadragon.json /var/www/drupal/web/sites/default/files/library-definitions && \
     chown -R nginx:nginx /var/www/drupal && \
+    mkdir -p /tmp/drupal/tmp && chown -R 1000:nginx /tmp/drupal && chmod 775 /tmp/drupal/tmp && \
     cleanup.sh
 
 FROM local/drupal:latest

From 4784ba5d25f284c8a12d018e56514022e32f4bc6 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Fri, 2 Sep 2022 09:11:16 -0400
Subject: [PATCH 08/11] Correct tmp ownership

---
 demo/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/Dockerfile b/demo/Dockerfile
index 3a3f1977..6c07f437 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -66,7 +66,7 @@ RUN --mount=type=cache,target=/root/.composer/cache \
     mkdir -p /var/www/drupal/web/sites/default/files/library-definitions && \
     cp /var/www/drupal/web/modules/contrib/openseadragon/openseadragon.json /var/www/drupal/web/sites/default/files/library-definitions && \
     chown -R nginx:nginx /var/www/drupal && \
-    mkdir -p /tmp/drupal/tmp && chown -R 1000:nginx /tmp/drupal && chmod 775 /tmp/drupal/tmp && \
+    mkdir -p /tmp/drupal/tmp && chown -R nginx: /tmp/drupal && chmod -R 775 /tmp/drupal/tmp && \
     cleanup.sh
 
 FROM local/drupal:latest

From 1200182d18f21e512e59fc3334de3fda03f2a55d Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 8 Sep 2022 21:28:12 -0400
Subject: [PATCH 09/11] Update solr

---
 activemq/Dockerfile | 14 ++++++++++----
 demo/Dockerfile     | 24 +++++++++++++++---------
 solr/Dockerfile     | 14 +++++++++-----
 solr/README.md      |  6 +++---
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/activemq/Dockerfile b/activemq/Dockerfile
index 8e9dcec4..6097166d 100644
--- a/activemq/Dockerfile
+++ b/activemq/Dockerfile
@@ -1,10 +1,14 @@
 # syntax=docker/dockerfile:experimental
+ARG ACTIVEMQ_VERSION="5.16.3"
+
 FROM local/java:latest as builder
+ARG ACTIVEMQ_VERSION
 
 COPY rootfs/heartbeat-interval.patch /
 
-RUN ACTIVEMQ_VERSION="5.16.3" && \
-    ACTIVEMQ_GIT_REPO="https://github.com/apache/activemq" && \
+RUN apk --no-cache add git
+
+RUN ACTIVEMQ_GIT_REPO="https://github.com/apache/activemq" && \
     ACTIVEMQ_GIT_TAG="activemq-${ACTIVEMQ_VERSION}" && \
     mkdir -p /opt/builds && \
     cd /opt/builds && \
@@ -31,13 +35,14 @@ RUN cd /opt/builds/activemq/assembly && \
 FROM local/java:latest
 
 RUN mkdir -p /opt/downloads
+ARG ACTIVEMQ_VERSION
 
-COPY --from=builder /opt/builds/activemq/assembly/target/apache-activemq-5.16.3-bin.tar.gz /opt/downloads
+COPY --from=builder /opt/builds/activemq/assembly/target/apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz /opt/downloads
 
 # install-apache-service.sh modified to not require a signed artifact
 RUN install-apache-service.sh \
       --name activemq \
-      --file /opt/downloads/apache-activemq-5.16.3-bin.tar.gz \
+      --file /opt/downloads/apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz \
     examples webapps-demo docs
 
 WORKDIR /opt/activemq
@@ -47,3 +52,4 @@ EXPOSE 61616 5672 61613 1883 61614 8161
 COPY rootfs /
 
 RUN chown -R activemq:activemq /opt/activemq
+RUN apk --no-cache add procps
\ No newline at end of file
diff --git a/demo/Dockerfile b/demo/Dockerfile
index 6c07f437..cc94ea72 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -5,6 +5,7 @@ FROM local/nginx:latest as composer
 RUN --mount=type=cache,target=/root/.composer/cache \
     --mount=id=downloads,type=cache,target=/opt/downloads \
     DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \
+    mkdir -p /tmp/drupal/tmp && chown -R nginx: /tmp/drupal && chmod -R 775 /tmp/drupal/tmp && \
     composer create-project islandora/drupal-project:8.8.1 \
         --prefer-dist \
         --no-interaction \
@@ -14,14 +15,18 @@ RUN --mount=type=cache,target=/root/.composer/cache \
         /var/www/drupal \
     && \
     cd /var/www/drupal && \
-    composer config repositories.1 '{"name": "islandora/chullo","type": "git","url": "https://github.com/Islandora/chullo.git","trunk-path" : "dev-dev#a7c1e051eab2a5077eaf5db2649201fa775c5a02"}' && \
-    composer config repositories.1 --json '{"type": "package","package": {"name": "islandora/chullo","version": "dev-dev","type": "drupal-module","source": {"url": "https://github.com/Islandora/chullo.git","type": "git","reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02"}}}' && \
+    mkdir -p /var/www/drupal/web/modules/contrib && \
+    composer config extra.installer-paths --json '{"sites/all/modules/contrib/{$name}/": ["type:drupal-module"]}' && \
     composer config --no-plugins allow-plugins.cweagans/composer-patches true && \
     composer config --no-plugins allow-plugins.composer/installers true && \
     composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true && \
     composer config --no-plugins allow-plugins.zaporylie/composer-drupal-optimizations true && \
     composer config --no-plugins allow-plugins.drupal/console-extend-plugin true && \
-    composer require --update-no-dev -- \
+    composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true && \
+    composer config repositories.1 '{"name": "islandora/chullo","type": "git","url": "https://github.com/Islandora/chullo.git","trunk-path" : "dev-dev#a7c1e051eab2a5077eaf5db2649201fa775c5a02"}' && \
+    composer config repositories.1 --json '{"type": "package","package": {"name": "islandora/chullo","version": "dev-dev","type": "drupal-module","source": {"url": "https://github.com/Islandora/chullo.git","type": "git","reference": "a7c1e051eab2a5077eaf5db2649201fa775c5a02","canonical": false}}}' && \
+    composer require "islandora/chullo:dev-dev as 1.x-dev" && \
+    composer require --no-update -- \
         drupal/admin_toolbar:^2.0 \
         drupal/console:~1.0 \
         drupal/content_browser:^1.0@alpha \
@@ -38,8 +43,8 @@ RUN --mount=type=cache,target=/root/.composer/cache \
         islandora-rdm/islandora_fits:dev-master \
         islandora/carapace:dev-8.x-3.x \
         islandora/islandora_defaults:dev-8.x-1.x \
-        zaporylie/composer-drupal-optimizations:^1.0 \
-        islandora/chullo:dev-dev && \
+        islandora/openseadragon:dev-8.x-1.x \
+        zaporylie/composer-drupal-optimizations:^1.0 && \
     mkdir -p /var/www/drupal/web/libraries && \
     MASONRY_VERSION="3.3.2" && \
     MASONRY_FILE="v${MASONRY_VERSION}.zip" && \
@@ -47,7 +52,7 @@ RUN --mount=type=cache,target=/root/.composer/cache \
     MASONRY_SHA256="85dc8b2cdf789693a14022dadc3e573a87d625da5da1cf83e1ef1e5af22af496" && \
     download.sh --url "${MASONRY_URL}" --sha256 "${MASONRY_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     unzip "${DOWNLOAD_CACHE_DIRECTORY}/${MASONRY_FILE}" -d /var/www/drupal/web/libraries && \
-    mv  /var/www/drupal/web/libraries/masonry-${MASONRY_VERSION} /var/www/drupal/web/libraries/masonry && \
+    mv /var/www/drupal/web/libraries/masonry-${MASONRY_VERSION} /var/www/drupal/web/libraries/masonry && \
     PDFJS_VERSION="2.0.943" && \
     PDFJS_FILE="pdfjs-${PDFJS_VERSION}-dist.zip" && \
     PDFJS_URL="https://github.com/mozilla/pdf.js/releases/download/v${PDFJS_VERSION}/${PDFJS_FILE}" && \
@@ -64,13 +69,14 @@ RUN --mount=type=cache,target=/root/.composer/cache \
     unzip "${DOWNLOAD_CACHE_DIRECTORY}/${OPENSEADRAGON_FILE}" -d /var/www/drupal/web/sites/all/assets/vendor && \
     mv "/var/www/drupal/web/sites/all/assets/vendor/${OPENSEADRAGON_FILE%.zip}" /var/www/drupal/web/sites/all/assets/vendor/openseadragon && \
     mkdir -p /var/www/drupal/web/sites/default/files/library-definitions && \
-    cp /var/www/drupal/web/modules/contrib/openseadragon/openseadragon.json /var/www/drupal/web/sites/default/files/library-definitions && \
+    curl https://raw.githubusercontent.com/Islandora/openseadragon/8.x-1.x/openseadragon.json -o /var/www/drupal/web/sites/default/files/library-definitions/openseadragon.json && \
+    # Something is wrong with where composer is installing modules.
+    # cp /var/www/drupal/web/modules/contrib/openseadragon/openseadragon.json /var/www/drupal/web/sites/default/files/library-definitions && \
     chown -R nginx:nginx /var/www/drupal && \
-    mkdir -p /tmp/drupal/tmp && chown -R nginx: /tmp/drupal && chmod -R 775 /tmp/drupal/tmp && \
     cleanup.sh
 
 FROM local/drupal:latest
-
+RUN apk --no-cache add procps
 COPY --chown=nginx:nginx --from=composer /var/www/drupal /var/www/drupal
 
 COPY rootfs /
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 13786087..e539621f 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,18 +1,22 @@
 # syntax=docker/dockerfile:experimental
 FROM local/java:latest
 
+RUN apk --no-cache add git
+
+ARG SOLR_VERSION="8.11.2"
+ARG SOLR_KEYS="86EDB9C33B8517228E88A8F93E48C0C6EF362B9E"
+ARG SOLR_FILE_SHA256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6"
+ARG SOLR_SIG_SHA256="1dc449783b89ae9287d1e31db0514d62aeb6edce199d541a29303e8d5c98d31e"
+
 RUN --mount=id=downloads,type=cache,target=/opt/downloads \
     DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \
-    SOLR_VERSION="8.11.2" && \
     SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \
-    SOLR_URL="https://dlcdn.apache.org/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \
-    SOLR_FILE_SHA256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6" && \
-    SOLR_SIG_SHA256="1dc449783b89ae9287d1e31db0514d62aeb6edce199d541a29303e8d5c98d31e" && \
+    SOLR_URL="https://archive.apache.org/dist/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \
     download.sh --url "${SOLR_URL}" --sha256 "${SOLR_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     download.sh --url "${SOLR_URL}.asc" --sha256 "${SOLR_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \
     install-apache-service.sh \
         --name solr \
-        --key "86EDB9C33B8517228E88A8F93E48C0C6EF362B9E" \
+        --key "${SOLR_KEYS}" \
         --file "${DOWNLOAD_CACHE_DIRECTORY}/${SOLR_FILE}" \ 
         docs example licenses server/solr/configsets
 
diff --git a/solr/README.md b/solr/README.md
index e64cb57a..623d408f 100644
--- a/solr/README.md
+++ b/solr/README.md
@@ -1,6 +1,6 @@
 # Solr
 
-Docker image for [Solr] version 7.1.0.
+Docker image for [Solr] version 8.11.2.
 
 Please refer to the [Solr Documentation] for more in-depth information.
 
@@ -35,6 +35,6 @@ additional settings, volumes, ports, etc.
 | :----------------------------- | :------------- |
 | /opt/solr/server/logs/solr.log | [Solr Logging] |
 
-[Solr Documentation]: https://lucene.apache.org/solr/guide/7_1/
-[Solr Logging]: https://lucene.apache.org/solr/guide/7_1/configuring-logging.html
+[Solr Documentation]: https://lucene.apache.org/solr/guide/8_11/
+[Solr Logging]: https://lucene.apache.org/solr/guide/8_11/configuring-logging.html
 [Solr]: https://lucene.apache.org/solr/

From 15ff6c2d7e06004b4ff53aa85ccb8d9deea55a05 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Thu, 8 Sep 2022 21:28:51 -0400
Subject: [PATCH 10/11] Add dependency check for gradle

---
 build.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index aa777d3b..51068195 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,12 @@ buildscript {
         maven {
             url = uri("https://plugins.gradle.org/m2/")
         }
+        mavenCentral()
     }
     dependencies {
         classpath("ca.islandora:isle-gradle-docker-plugin:0.0.1")
         classpath("com.palantir.gradle.gitversion:gradle-git-version:0.12.3")
+        classpath("org.owasp:dependency-check-gradle:7.1.2")
     }
 }
 
@@ -20,3 +22,4 @@ allprojects {
 }
 
 apply(plugin = "ca.islandora.gradle.docker")
+apply(plugin = "org.owasp.dependencycheck")
\ No newline at end of file

From a6900441ede5434627e3feba3ac209a89df55da0 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Fri, 9 Sep 2022 08:05:20 -0400
Subject: [PATCH 11/11] apk cache clear, update and build network use host

---
 .github/workflows/main.yml                   | 4 ++--
 abuild/Dockerfile                            | 4 +++-
 solr/rootfs/etc/cont-init.d/02-solr-setup.sh | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b89d9c2a..05aad571 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -97,7 +97,7 @@ jobs:
             export IMAGE_DESC="IDC ${{matrix.image-name}} image (via idc-isle-buildkit commit ${{ github.sha }})"
           fi
           echo "FROM ${{ secrets.REPOSITORY }}/${{matrix.image-name}}:${{needs.setup.outputs.image-tag}}" | \
-          docker build -t ${{ secrets.REPOSITORY }}/${{matrix.image-name}}:${{needs.setup.outputs.image-tag}} \
+          docker build --network=host -t ${{ secrets.REPOSITORY }}/${{matrix.image-name}}:${{needs.setup.outputs.image-tag}} \
             --label org.opencontainers.image.title="idc-isle-buildkit ${{matrix.image-name}}"\
             --label org.opencontainers.image.description="${IMAGE_DESC}" \
             --label org.opencontainers.image.url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/tree/${{github.event.repository.default_branch}}/${{matrix.image-name}} \
@@ -146,7 +146,7 @@ jobs:
           fi
           export STATIC_TAG=$(docker images | grep ${{ secrets.REPOSITORY }}/drupal-static | awk '{print $2}')
           echo "FROM ${{ secrets.REPOSITORY }}/drupal-static:${STATIC_TAG}" | \
-          docker build -t ${{ secrets.REPOSITORY }}/drupal-static:${{needs.setup.outputs.image-tag}} \
+          docker build --network=host -t ${{ secrets.REPOSITORY }}/drupal-static:${{needs.setup.outputs.image-tag}} \
             --label org.opencontainers.image.title="idc-isle-buildkit drupal-static" \
             --label org.opencontainers.image.description="${IMAGE_DESC}" \
             --label org.opencontainers.image.url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/tree/${{github.event.repository.default_branch}}/drupal \
diff --git a/abuild/Dockerfile b/abuild/Dockerfile
index d1b72326..677a75cf 100644
--- a/abuild/Dockerfile
+++ b/abuild/Dockerfile
@@ -5,11 +5,13 @@ FROM alpine:3.14
 RUN --mount=type=cache,target=/var/cache/apk \ 
     --mount=type=cache,target=/etc/cache/apk \
     ln -s /var/cache/apk /etc/apk/cache && \
+    rm -rf /var/cache/apk/* && rm -rf /tmp/* && \
+    apk update && \
     apk add --update \
         alpine-sdk \
         coreutils \
         sudo \
+        procps \
     && \
     adduser -G abuild -g "Alpine Package Builder" -s /bin/ash -D builder && \
     echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
diff --git a/solr/rootfs/etc/cont-init.d/02-solr-setup.sh b/solr/rootfs/etc/cont-init.d/02-solr-setup.sh
index c5aceecf..d43fa0ec 100755
--- a/solr/rootfs/etc/cont-init.d/02-solr-setup.sh
+++ b/solr/rootfs/etc/cont-init.d/02-solr-setup.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/with-contenv bash
 set -e
 
+apk update && apk --no-cache add procps
 
 # Copy the solr config
 cp /solr_config/* /opt/solr/server/solr/ISLANDORA/conf/