From 0f4f7278c31bfc314c3dfe722bb207d78673a007 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 28 Aug 2024 11:05:15 -0500 Subject: [PATCH] Stop testing on JDK11 It is past EOL --- .github/workflows/ci.yml | 8 +--- docker/Linux-JDK11/Dockerfile | 55 ------------------------- docker/Linux-JDK11/docker-compose.yml | 21 ---------- docker/Windows-JDK11/Dockerfile | 28 ------------- docker/Windows-JDK11/Dockerfile-minio | 10 ----- docker/Windows-JDK11/docker-compose.yml | 19 --------- 6 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 docker/Linux-JDK11/Dockerfile delete mode 100644 docker/Linux-JDK11/docker-compose.yml delete mode 100644 docker/Windows-JDK11/Dockerfile delete mode 100644 docker/Windows-JDK11/Dockerfile-minio delete mode 100644 docker/Windows-JDK11/docker-compose.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f33ec905a..34ef7f9fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,11 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - java: [jdk11, jdk17, jdk18, jdk21, graalvm] + java: [jdk17, jdk18, jdk21, graalvm] fail-fast: false steps: - name: Check out the repository uses: actions/checkout@v4 - - name: Test in Linux JDK 11 - if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk11' - run: docker compose -f docker/Linux-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe - name: Test in Linux JDK 17 (LTS) if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk17' run: docker compose -f docker/Linux-JDK17/compose.yaml up --build --exit-code-from cantaloupe @@ -31,9 +28,6 @@ jobs: - name: Test in Linux GraalVM if: matrix.os == 'ubuntu-latest' && matrix.java == 'graalvm' run: docker compose -f docker/Linux-GraalVM20/compose.yaml up --build --exit-code-from cantaloupe - - name: Test in Windows JDK 11 - if: matrix.os == 'windows-latest' && matrix.java == 'jdk11' - run: docker compose -f docker/Windows-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe - name: Test in Windows JDK 17 (LTS) if: matrix.os == 'windows-latest' && matrix.java == 'jdk17' run: docker compose -f docker/Windows-JDK17/compose.yaml up --build --exit-code-from cantaloupe diff --git a/docker/Linux-JDK11/Dockerfile b/docker/Linux-JDK11/Dockerfile deleted file mode 100644 index acadf2c20..000000000 --- a/docker/Linux-JDK11/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM ubuntu:noble - -ARG DEBIAN_FRONTEND=noninteractive - -# Install various dependencies - -RUN apt-get update && apt-get install -y --no-install-recommends \ - openjdk-11-jdk-headless \ - ffmpeg \ - maven \ - wget \ - libopenjp2-tools \ - liblcms2-dev \ - libpng-dev \ - libzstd-dev \ - libtiff-dev \ - libjpeg-dev \ - zlib1g-dev \ - libwebp-dev \ - libimage-exiftool-perl \ - libgrokj2k1 \ - grokj2k-tools \ - adduser \ - && rm -rf /var/lib/apt/lists/* - -# Install TurboJpegProcessor dependencies -RUN mkdir -p /opt/libjpeg-turbo/lib -COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib - -# Install KakaduNativeProcessor dependencies -COPY dist/deps/Linux-x86-64/lib/* /usr/lib/ - -# Install GrokProcessor dependencies -#RUN wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/libgrokj2k1_7.6.5-1_amd64.deb \ -# && wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/grokj2k-tools_7.6.5-1_amd64.deb \ -# && dpkg -i ./libgrokj2k1_7.6.5-1_amd64.deb \ -# && dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb - -# 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 mvn --quiet dependency:resolve - -# Copy the code -COPY --chown=cantaloupe docker/image_files/test.properties test.properties -COPY --chown=cantaloupe ./src src - -ENTRYPOINT mvn --batch-mode test -Pfreedeps diff --git a/docker/Linux-JDK11/docker-compose.yml b/docker/Linux-JDK11/docker-compose.yml deleted file mode 100644 index 7d6a317d6..000000000 --- a/docker/Linux-JDK11/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -# -# N.B.: docker-compose must be invoked from the project root directory: -# -# docker-compose -f path/to/docker-compose.yml up --exit-code-from cantaloupe -# -version: '3' -services: - cantaloupe: - build: - context: ../../ - dockerfile: $PWD/docker/Linux-JDK11/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 diff --git a/docker/Windows-JDK11/Dockerfile b/docker/Windows-JDK11/Dockerfile deleted file mode 100644 index 4dddd7d87..000000000 --- a/docker/Windows-JDK11/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -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 ojdkbuild11 maven ffmpeg - -# Install TurboJpegProcessor dependencies TODO: libjpeg-turbo -#RUN mkdir -p /opt/libjpeg-turbo/lib -#COPY docker/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/image_files/test.properties test.properties -COPY src src diff --git a/docker/Windows-JDK11/Dockerfile-minio b/docker/Windows-JDK11/Dockerfile-minio deleted file mode 100644 index 115389668..000000000 --- a/docker/Windows-JDK11/Dockerfile-minio +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/docker/Windows-JDK11/docker-compose.yml b/docker/Windows-JDK11/docker-compose.yml deleted file mode 100644 index edc65a184..000000000 --- a/docker/Windows-JDK11/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -# -# N.B.: docker-compose must be invoked from the project root directory: -# -# docker-compose -f path/to/docker-compose.yml up --exit-code-from cantaloupe -# -version: '3' -services: - cantaloupe: - build: - context: ../../ - dockerfile: docker/Windows-JDK11/Dockerfile - minio: - build: - context: ../../ - dockerfile: docker/Windows-JDK11/Dockerfile-minio - environment: - MINIO_ACCESS_KEY: MinioUser - MINIO_SECRET_KEY: OpenSesame - hostname: minio