From 62320b24fee9ee90049d4d8a8779826730a8eddb Mon Sep 17 00:00:00 2001
From: Gavin Morris <gavin@born-digital.com>
Date: Fri, 5 Jan 2024 11:12:54 -0500
Subject: [PATCH 1/2] ISLE-1.5.28-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 4700108..c45dd81 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.27
+            ${{ secrets.DOCKERHUB_ORG }}/isle-imageservices:1.5.28
             ${{ secrets.DOCKERHUB_ORG }}/isle-imageservices:latest
       -
         name: Image digest
diff --git a/Dockerfile b/Dockerfile
index 751defd..b95f96e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM islandoracollabgroup/isle-tomcat:1.5.27
+FROM borndigital/isle-tomcat:1.5.28
 
 # 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.27
 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-19} \
+    IMAGEMAGICK_VERSION=${IMAGEMAGICK_VERSION:-7.1.1-25} \
     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 e516c3e77986acf5d7a8bb5c863352ac664aa23f Mon Sep 17 00:00:00 2001
From: Gavin Morris <gavin@born-digital.com>
Date: Fri, 5 Jan 2024 13:39:23 -0500
Subject: [PATCH 2/2] ISLE-1.5.28-release - Security and Application upgrades

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

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