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..24b2ec4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM islandoracollabgroup/isle-tomcat:1.5.25 +FROM islandoracollabgroup/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 \