Skip to content

Commit

Permalink
Merge pull request #48 from Born-Digital-US/ISLE-v.1.5.28-dev
Browse files Browse the repository at this point in the history
ISLE-1.5.28-release - Security and Application upgrades
  • Loading branch information
g7morris authored Jan 5, 2024
2 parents 59456bd + e516c3e commit 401975a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM islandoracollabgroup/isle-tomcat:1.5.27
FROM islandoracollabgroup/isle-tomcat:1.5.28

# Set up environmental variables for Tomcat, Cantaloupe & dependencies
# @see: Cantaloupe https://github.com/cantaloupe-project/cantaloupe/releases
# @see: ImageMagick https://github.com/ImageMagick/ImageMagick/releases
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 \
Expand Down

0 comments on commit 401975a

Please sign in to comment.