Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE:17 Add Env Arguments and Bump graphicsmagick version to 1.3.35 + esmero/esmero-cantaloupe:4.1.6RC1 #18

Merged
merged 1 commit into from
Oct 27, 2020
Merged

ISSUE:17 Add Env Arguments and Bump graphicsmagick version to 1.3.35 + esmero/esmero-cantaloupe:4.1.6RC1 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions esmero-cantaloupe/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ENV LANG en_US.UTF-8

# JRE fails to load fonts if there are no standard fonts in the image; This breaks Cantaloups /admin endpoint
# see https://github.com/docker-library/openjdk/issues/73#issuecomment-207816707
# Also make sure you setup temp_pathname in cantaloupe.properties to a safe/stable place since Classes are cached there too.

RUN apk add --update ttf-dejavu && rm -rf /var/cache/apk/*

Expand All @@ -21,8 +22,8 @@ RUN apk add --update ttf-dejavu && rm -rf /var/cache/apk/*

ENV CANTALOUPE_VERSION 4.1.6
ENV PKGNAME=graphicsmagick
# 1.3.34 (Released Dec 20, 2019)
ENV PKGVER=1.3.34
# 1.3.35 (Released Febr 23, 2020)
ENV PKGVER=1.3.35
# Uses 50% of the memory of 16. Use 16 if dealing with 48/64 bit pixels color
ENV QUANTUMDEPTH=8
ENV PKGSOURCE=http://downloads.sourceforge.net/$PKGNAME/$PKGNAME/$PKGVER/GraphicsMagick-$PKGVER.tar.lz
Expand Down Expand Up @@ -100,6 +101,7 @@ RUN wget $PKGSOURCE && \

RUN adduser -S cantaloupe
RUN apk add --update --no-cache ffmpeg
RUN apk add --update --no-cache libjpeg-turbo libjpeg-turbo-utils

# Cantaloupe
WORKDIR /tmp
Expand All @@ -121,5 +123,13 @@ RUN mkdir -p /var/log/cantaloupe \
&& chown -R cantaloupe /etc/cantaloupe

USER cantaloupe

ARG XMX=2g
ARG XMS=256m

ENV XMS=${XMS}
ENV XMX=${XMX}


VOLUME ["/var/log/cantaloupe", "/var/cache/cantaloupe"]
CMD ["sh", "-c", "java -Dcantaloupe.config=/etc/cantaloupe/cantaloupe.properties -Xmx2g -jar /usr/local/cantaloupe/cantaloupe-$CANTALOUPE_VERSION.war"]
CMD ["sh", "-c", "java -Dcantaloupe.config=/etc/cantaloupe/cantaloupe.properties -Xms${XMS} -Xmx${XMX} -jar /usr/local/cantaloupe/cantaloupe-$CANTALOUPE_VERSION.war"]
11 changes: 9 additions & 2 deletions esmero-cantaloupe/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Esmero-cantaloupe IIIF Cantaloupe container

Cantaloupe 4.03 Docker Image with Graphicsmagic and ffmpeg processors for the Archipelago Project
Cantaloupe 4.16 Docker Image with Graphicsmagic, TurboJpeg and ffmpeg processors for the Archipelago Project

### Building the image
```SHELL
Expand Down Expand Up @@ -44,8 +44,15 @@ http://localhost:8183/iiif/2/esmero_test_video_by_diego.m4v/full/full/0/default.
ffmpeg
GraphicsMagic
pdfbox
TurboJpeg
Kakadu Native processor
S3 enabled
Admin interface is enabled
http://localhost:8183/admin

Allows also ENV to be passed via e.g a docker-compose.yml
Available ones are JavaVM Arguments
XMX: 2gb (default)
XMS: 256m (default)


http://localhost:8183/admin