From a8a0a749de34f75144faf0d5a2c62a8b3fdf4b61 Mon Sep 17 00:00:00 2001
From: Gavin Morris <gavin@born-digital.com>
Date: Sun, 9 Jul 2023 14:27:46 -0400
Subject: [PATCH 1/2] ISLE-1.5.26-release - Security and Application upgrades

---
 .github/workflows/docker-image.yml | 2 +-
 Dockerfile                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c14ad74..9d68545 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -41,7 +41,7 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_ORG }}/isle-imageservices:1.5.25
+            ${{ secrets.DOCKERHUB_ORG }}/isle-imageservices:1.5.26
             ${{ secrets.DOCKERHUB_ORG }}/isle-imageservices:latest
       -
         name: Image digest
diff --git a/Dockerfile b/Dockerfile
index a219667..672c5de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM islandoracollabgroup/isle-tomcat:1.5.25
+FROM borndigital/isle-tomcat:1.5.26
 
 # Set up environmental variables for Tomcat, Cantaloupe & dependencies
 # @see: Cantaloupe https://github.com/cantaloupe-project/cantaloupe/releases
@@ -6,7 +6,7 @@ FROM islandoracollabgroup/isle-tomcat:1.5.25
 ENV JAVA_MAX_MEM=${JAVA_MAX_MEM:-2G} \
     JAVA_MIN_MEM=${JAVA_MIN_MEM:-0} \
     CANTALOUPE_VERSION=${CANTALOUPE_VERSION:-4.1.11} \
-    IMAGEMAGICK_VERSION=${IMAGEMAGICK_VERSION:-7.1.1-5} \
+    IMAGEMAGICK_VERSION=${IMAGEMAGICK_VERSION:-7.1.1-12} \
     OPENJPEG_VERSION=${OPENJPEG_VERSION:-v2.5.0} \
     JAVA_OPTS='-Djava.awt.headless=true -server -Xmx${JAVA_MAX_MEM} -Xms${JAVA_MIN_MEM} -XX:+UseG1GC -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=200 -XX:InitiatingHeapOccupancyPercent=70 -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true' \
     KAKADU_HOME=/usr/local/cantaloupe/deps/Linux-x86-64/bin \

From 60efbd2db3376176d6b35c0565263f5b71f67cf1 Mon Sep 17 00:00:00 2001
From: Gavin Morris <gavin@born-digital.com>
Date: Sun, 9 Jul 2023 17:27:07 -0400
Subject: [PATCH 2/2] ISLE-1.5.26-release - Security and Application upgrades

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

diff --git a/Dockerfile b/Dockerfile
index 672c5de..24b2ec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM borndigital/isle-tomcat:1.5.26
+FROM islandoracollabgroup/isle-tomcat:1.5.26
 
 # Set up environmental variables for Tomcat, Cantaloupe & dependencies
 # @see: Cantaloupe https://github.com/cantaloupe-project/cantaloupe/releases