-
Notifications
You must be signed in to change notification settings - Fork 111
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.
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
Test with OpenJDK 17 & 21 (LTS) #689
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
FROM ubuntu:lunar | ||
|
||
ARG DEBIAN_FRONTEND=noninteractive | ||
|
||
# Install various dependencies: | ||
# * ca-certificates is needed by wget | ||
# * ffmpeg is needed by FfmpegProcessor | ||
# * wget download stuffs in this dockerfile | ||
# * libopenjp2-tools is needed by OpenJpegProcessor | ||
# * All the rest is needed by GrokProcessor | ||
RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
ffmpeg \ | ||
wget \ | ||
libopenjp2-tools \ | ||
liblcms2-dev \ | ||
libpng-dev \ | ||
libzstd-dev \ | ||
libtiff-dev \ | ||
libjpeg-dev \ | ||
zlib1g-dev \ | ||
libwebp-dev \ | ||
libimage-exiftool-perl \ | ||
libgrokj2k1 \ | ||
grokj2k-tools \ | ||
adduser \ | ||
openjdk-17-jdk \ | ||
maven \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Install TurboJpegProcessor dependencies | ||
RUN mkdir -p /opt/libjpeg-turbo/lib | ||
COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib | ||
|
||
# Install KakaduNativeProcessor dependencies | ||
COPY dist/deps/Linux-x86-64/lib/* /usr/lib/ | ||
|
||
# A non-root user is needed for some FilesystemSourceTest tests to work. | ||
ARG user=cantaloupe | ||
ARG home=/home/$user | ||
RUN adduser --home $home $user | ||
RUN chown -R $user $home | ||
USER $user | ||
WORKDIR $home | ||
|
||
# Install application dependencies | ||
COPY ./pom.xml pom.xml | ||
|
||
RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" > ~/.bashrc | ||
RUN mvn --quiet dependency:resolve | ||
|
||
# Copy the code | ||
COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties | ||
COPY --chown=cantaloupe ./src src | ||
|
||
ENTRYPOINT mvn --batch-mode test -Pfreedeps |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# | ||
# N.B.: docker compose must be invoked from the project root directory: | ||
# | ||
# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe | ||
# | ||
services: | ||
cantaloupe: | ||
build: | ||
context: ../../ | ||
dockerfile: $PWD/docker/Linux-JDK17/Dockerfile | ||
minio: | ||
image: minio/minio | ||
environment: | ||
MINIO_ACCESS_KEY: MinioUser | ||
MINIO_SECRET_KEY: OpenSesame | ||
hostname: minio | ||
command: server /data | ||
redis: | ||
image: redis:alpine | ||
hostname: redis |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
FROM ubuntu:lunar | ||
|
||
ARG DEBIAN_FRONTEND=noninteractive | ||
|
||
# Install various dependencies: | ||
# * ca-certificates is needed by wget | ||
# * ffmpeg is needed by FfmpegProcessor | ||
# * wget download stuffs in this dockerfile | ||
# * libopenjp2-tools is needed by OpenJpegProcessor | ||
# * All the rest is needed by GrokProcessor | ||
RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
ffmpeg \ | ||
wget \ | ||
libopenjp2-tools \ | ||
liblcms2-dev \ | ||
libpng-dev \ | ||
libzstd-dev \ | ||
libtiff-dev \ | ||
libjpeg-dev \ | ||
zlib1g-dev \ | ||
libwebp-dev \ | ||
libimage-exiftool-perl \ | ||
libgrokj2k1 \ | ||
grokj2k-tools \ | ||
adduser \ | ||
openjdk-21-jdk \ | ||
maven \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Install TurboJpegProcessor dependencies | ||
RUN mkdir -p /opt/libjpeg-turbo/lib | ||
COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib | ||
|
||
# Install KakaduNativeProcessor dependencies | ||
COPY dist/deps/Linux-x86-64/lib/* /usr/lib/ | ||
|
||
# A non-root user is needed for some FilesystemSourceTest tests to work. | ||
ARG user=cantaloupe | ||
ARG home=/home/$user | ||
RUN adduser --home $home $user | ||
RUN chown -R $user $home | ||
USER $user | ||
WORKDIR $home | ||
|
||
# Install application dependencies | ||
COPY ./pom.xml pom.xml | ||
|
||
RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" > ~/.bashrc | ||
RUN mvn --quiet dependency:resolve | ||
|
||
# Copy the code | ||
COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same with the test.properties. Should be in a shared space instead of inside a specific JDK folder |
||
COPY --chown=cantaloupe ./src src | ||
|
||
ENTRYPOINT mvn --batch-mode test -Pfreedeps |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# | ||
# N.B.: docker compose must be invoked from the project root directory: | ||
# | ||
# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe | ||
# | ||
services: | ||
cantaloupe: | ||
build: | ||
context: ../../ | ||
dockerfile: $PWD/docker/Linux-JDK21/Dockerfile | ||
minio: | ||
image: minio/minio | ||
environment: | ||
MINIO_ACCESS_KEY: MinioUser | ||
MINIO_SECRET_KEY: OpenSesame | ||
hostname: minio | ||
command: server /data | ||
redis: | ||
image: redis:alpine | ||
hostname: redis |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
|
||
ENV chocolateyUseWindowsCompression false | ||
|
||
# Install the Chocolatey package manager, which makes it easier to install | ||
# dependencies. | ||
RUN powershell -Command \ | ||
iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \ | ||
choco feature disable --name showDownloadProgress | ||
|
||
# Install various dependencies | ||
# TODO: openjpeg | ||
RUN choco install -y maven ffmpeg | ||
RUN choco install -y openjdk --version=17.0.2 | ||
|
||
# Install TurboJpegProcessor dependencies TODO: libjpeg-turbo | ||
#RUN mkdir -p /opt/libjpeg-turbo/lib | ||
#COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32 | ||
|
||
# Install KakaduNativeProcessor dependencies | ||
COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/ | ||
|
||
# Install application dependencies | ||
COPY pom.xml pom.xml | ||
RUN mvn dependency:resolve | ||
|
||
# Copy the code | ||
COPY docker/Windows-JDK11/image_files/test.properties test.properties | ||
COPY src src |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
|
||
ENV MINIO_ACCESS_KEY=MinioUser | ||
ENV MINIO_SECRET_KEY=OpenSesame | ||
|
||
RUN curl.exe --output minio.exe --url https://dl.min.io/server/minio/release/windows-amd64/minio.exe | ||
|
||
RUN mkdir c:\data | ||
|
||
CMD minio.exe server --address=:9000 c:\data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# | ||
# N.B.: docker-compose must be invoked from the project root directory: | ||
# | ||
# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe | ||
# | ||
services: | ||
cantaloupe: | ||
build: | ||
context: ../../ | ||
dockerfile: docker/Windows-JDK17/Dockerfile | ||
minio: | ||
build: | ||
context: ../../ | ||
dockerfile: docker/Windows-JDK17/Dockerfile-minio | ||
environment: | ||
MINIO_ACCESS_KEY: MinioUser | ||
MINIO_SECRET_KEY: OpenSesame | ||
hostname: minio |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
|
||
ENV chocolateyUseWindowsCompression false | ||
|
||
# Install the Chocolatey package manager, which makes it easier to install | ||
# dependencies. | ||
RUN powershell -Command \ | ||
iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \ | ||
choco feature disable --name showDownloadProgress | ||
|
||
# Install various dependencies | ||
# TODO: openjpeg | ||
RUN choco install -y maven ffmpeg | ||
RUN choco install -y openjdk --version=21.0.2 | ||
|
||
# Install TurboJpegProcessor dependencies TODO: libjpeg-turbo | ||
#RUN mkdir -p /opt/libjpeg-turbo/lib | ||
#COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32 | ||
|
||
# Install KakaduNativeProcessor dependencies | ||
COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/ | ||
|
||
# Install application dependencies | ||
COPY pom.xml pom.xml | ||
RUN mvn dependency:resolve | ||
|
||
# Copy the code | ||
COPY docker/Windows-JDK11/image_files/test.properties test.properties | ||
COPY src src |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
FROM mcr.microsoft.com/windows/servercore:ltsc2022 | ||
|
||
ENV MINIO_ACCESS_KEY=MinioUser | ||
ENV MINIO_SECRET_KEY=OpenSesame | ||
|
||
RUN curl.exe --output minio.exe --url https://dl.min.io/server/minio/release/windows-amd64/minio.exe | ||
|
||
RUN mkdir c:\data | ||
|
||
CMD minio.exe server --address=:9000 c:\data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# | ||
# N.B.: docker-compose must be invoked from the project root directory: | ||
# | ||
# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe | ||
# | ||
services: | ||
cantaloupe: | ||
build: | ||
context: ../../ | ||
dockerfile: docker/Windows-JDK21/Dockerfile | ||
minio: | ||
build: | ||
context: ../../ | ||
dockerfile: docker/Windows-JDK21/Dockerfile-minio | ||
environment: | ||
MINIO_ACCESS_KEY: MinioUser | ||
MINIO_SECRET_KEY: OpenSesame | ||
hostname: minio |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might want to move the built jpeg-turbo library into a shared space in case we deprecate JDK11. Just a note