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

[SERV-938] Update packages and base image #156

Merged
merged 2 commits into from
Oct 17, 2023
Merged

[SERV-938] Update packages and base image #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed59192
[SERV-938] Update packages and base image
ksclarke Oct 16, 2023
d776b4f
Make Codacy's Dockerfile check happy
ksclarke Oct 16, 2023
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
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,20 @@

<!-- Docker container dependency versions -->
<!-- https://packages.ubuntu.com/search?keywords=search -->
<ubuntu.tag>20.04</ubuntu.tag>
<openjdk.version>11.0.20+8-1ubuntu1~20.04</openjdk.version>
<gcc.version>4:9.3.0-1ubuntu2</gcc.version>
<make.version>4.2.1-1.2</make.version>
<libtiff.version>4.1.0+git191117-2ubuntu0.20.04.9</libtiff.version>
<build.essential.version>12.8ubuntu1.1</build.essential.version>
<libopenjp2.version>2.3.1-1ubuntu4.20.04.1</libopenjp2.version>
<libturbojpeg.version>2.0.3-0ubuntu1.20.04.3</libturbojpeg.version>
<unzip.version>6.0-25ubuntu1.1</unzip.version>
<zip.version>3.0-11build1</zip.version>
<curl.version>7.68.0-1ubuntu2.19</curl.version>
<ffmpeg.version>7:4.2.7-0ubuntu0.1</ffmpeg.version>
<python2.version>2.7.17-2ubuntu4</python2.version>
<grok.version>9.1.0</grok.version>
<ubuntu.tag>22.04</ubuntu.tag>
<openjdk.version>17.0.8.1+1~us1-0ubuntu1~22.04</openjdk.version>
<gcc.version>4:11.2.0-1ubuntu1</gcc.version>
<make.version>4.3-4.1build1</make.version>
<libtiff.version>4.3.0-6ubuntu0.6</libtiff.version>
<build.essential.version>12.9ubuntu3</build.essential.version>
<libopenjp2.version>2.4.0-6</libopenjp2.version>
<libturbojpeg.version>2.1.2-0ubuntu1</libturbojpeg.version>
<unzip.version>6.0-26ubuntu3.1</unzip.version>
<zip.version>3.0-12build2</zip.version>
<curl.version>7.81.0-1ubuntu1.14</curl.version>
<ffmpeg.version>7:4.4.2-0ubuntu0.22.04.1</ffmpeg.version>
<python2.version>2.7.18-3</python2.version>
<grok.version>11.0.0</grok.version>

<!-- Java dependency versions -->
<freelib.utils.version>3.0.1</freelib.utils.version>
Expand Down
20 changes: 10 additions & 10 deletions src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# We do a multi-stage build; the first stage builds the Cantaloupe code
FROM maven:3.6.3-jdk-11 AS MAVEN_TOOL_CHAIN
FROM maven:3.9.4-eclipse-temurin-17 AS MAVEN_TOOL_CHAIN

# Where we find the stable Cantaloupe Jar file
ENV CANTALOUPE_RELEASES="https://github.com/cantaloupe-project/cantaloupe/releases/download"
Expand Down Expand Up @@ -57,14 +57,14 @@ RUN if [ "${cantaloupe.version}" = "dev" ] ; then \
# The second stage of our multi-stage build builds the kakadu libraries and binaries
FROM ubuntu:${ubuntu.tag} AS KAKADU_TOOL_CHAIN

ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
ENV JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"

COPY kakadu /build/kakadu/
RUN if [ ! -z "${kakadu.version}" ]; then \
cd /build/kakadu/"${kakadu.version}"/make && \
apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get install -qq --no-install-recommends \
openjdk-11-jdk-headless=${openjdk.version}\
openjdk-17-jdk-headless=${openjdk.version}\
gcc=${gcc.version} \
make=${make.version} \
libtiff-tools=${libtiff.version} \
Expand Down Expand Up @@ -113,7 +113,7 @@ RUN apt-get update -qq && \
libtiff5-dev=${libtiff.version} \
libopenjp2-tools=${libopenjp2.version} \
libturbojpeg=${libturbojpeg.version} \
openjdk-11-jre-headless=${openjdk.version} \
openjdk-17-jre-headless=${openjdk.version} \
unzip=${unzip.version} \
zip=${zip.version} \
curl=${curl.version} \
Expand Down Expand Up @@ -174,12 +174,12 @@ RUN mkdir -p /var/log/cantaloupe /var/cache/cantaloupe && \
# Install grok JPEG-2000 library and tools
WORKDIR /tmp
ARG GROK_RELEASES="https://github.com/GrokImageCompression/grok/releases"
RUN curl -sL ${GROK_RELEASES}/download/v${grok.version}/grok-v${grok.version}-linux-amd64.tar.gz > grok.tar.gz && \
tar zxfv grok.tar.gz && \
cp ./grok-v${grok.version}-linux-amd64/bin/grk_* /usr/bin && \
cp ./grok-v${grok.version}-linux-amd64/lib/*libgrok* /usr/lib && \
cp -r ./grok-v${grok.version}-linux-amd64/include/grok* /usr/include && \
rm -rf /tmp/grok-v${grok.version}-linux-amd64 grok-v${grok.version}-linux-amd64.tar.gz
RUN curl -sL "${GROK_RELEASES}/download/v${grok.version}/grok-ubuntu-latest.zip" > grok.zip && \
unzip grok.zip && \
cp ./grok-ubuntu-latest/bin/grk_* /usr/bin && \
cp ./grok-ubuntu-latest/lib/*libgrok* /usr/lib && \
cp -r ./grok-ubuntu-latest/include/grok* /usr/include && \
rm -rf /tmp/grok-ubuntu-latest grok.zip

# Set up logging, keeping a separate log for just the errors (in addition to the full log)
ENV CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_PATHNAME=/var/log/cantaloupe/application.log
Expand Down
4 changes: 2 additions & 2 deletions src/main/docker/scripts/show_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ print_line() {
}

declare -a DEPENDENCIES=(
"openjdk-11-jdk-headless"
"openjdk-11-jre-headless"
"openjdk-17-jdk-headless"
"openjdk-17-jre-headless"
"gcc"
"python2"
"ffmpeg"
Expand Down
Loading