diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile index 55b7c044c..234616e03 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM20/Dockerfile @@ -8,26 +8,26 @@ ARG DEBIAN_FRONTEND=noninteractive # Install various dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ - 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/* + 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/Linux-JDK11/image_files/libjpeg-turbo/lib64 /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/ @@ -40,8 +40,8 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/ # Install GraalVM RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.0/graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \ - && tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \ - && mv graalvm-ce-java11-20.3.0 /opt + && tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \ + && mv graalvm-ce-java11-20.3.0 /opt # A non-root user is needed for some FilesystemSourceTest tests to work. ARG user=cantaloupe @@ -56,7 +56,7 @@ COPY ./pom.xml pom.xml RUN mvn --quiet dependency:resolve # Copy the code -COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties +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/Dockerfile b/docker/Linux-JDK11/Dockerfile index 28464a3d5..acadf2c20 100644 --- a/docker/Linux-JDK11/Dockerfile +++ b/docker/Linux-JDK11/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install TurboJpegProcessor dependencies RUN mkdir -p /opt/libjpeg-turbo/lib -COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /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/ @@ -49,7 +49,7 @@ COPY ./pom.xml pom.xml RUN mvn --quiet dependency:resolve # Copy the code -COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties +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-JDK17/Dockerfile b/docker/Linux-JDK17/Dockerfile index b9f415b86..b40ae6a6a 100644 --- a/docker/Linux-JDK17/Dockerfile +++ b/docker/Linux-JDK17/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install TurboJpegProcessor dependencies RUN mkdir -p /opt/libjpeg-turbo/lib -COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /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/ @@ -50,7 +50,7 @@ RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" > RUN mvn --quiet dependency:resolve # Copy the code -COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties +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-JDK18/Dockerfile b/docker/Linux-JDK18/Dockerfile index b999ca32a..d7f545d85 100644 --- a/docker/Linux-JDK18/Dockerfile +++ b/docker/Linux-JDK18/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install TurboJpegProcessor dependencies RUN mkdir -p /opt/libjpeg-turbo/lib -COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /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/ @@ -64,7 +64,7 @@ COPY ./pom.xml pom.xml RUN mvn --quiet dependency:resolve # Copy the code -COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties +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-JDK21/Dockerfile b/docker/Linux-JDK21/Dockerfile index c25cdb569..664d4be6a 100644 --- a/docker/Linux-JDK21/Dockerfile +++ b/docker/Linux-JDK21/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install TurboJpegProcessor dependencies RUN mkdir -p /opt/libjpeg-turbo/lib -COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /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/ @@ -50,7 +50,7 @@ RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" > RUN mvn --quiet dependency:resolve # Copy the code -COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties +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/Windows-JDK11/Dockerfile b/docker/Windows-JDK11/Dockerfile index ba1008de8..4dddd7d87 100644 --- a/docker/Windows-JDK11/Dockerfile +++ b/docker/Windows-JDK11/Dockerfile @@ -5,8 +5,8 @@ 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 + iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \ + choco feature disable --name showDownloadProgress # Install various dependencies # TODO: openjpeg @@ -14,7 +14,7 @@ RUN choco install -y ojdkbuild11 maven ffmpeg # 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 +#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32 # Install KakaduNativeProcessor dependencies COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/ @@ -24,5 +24,5 @@ COPY pom.xml pom.xml RUN mvn dependency:resolve # Copy the code -COPY docker/Windows-JDK11/image_files/test.properties test.properties +COPY docker/image_files/test.properties test.properties COPY src src diff --git a/docker/Windows-JDK11/image_files/test.properties b/docker/Windows-JDK11/image_files/test.properties deleted file mode 100644 index f82547a07..000000000 --- a/docker/Windows-JDK11/image_files/test.properties +++ /dev/null @@ -1,12 +0,0 @@ -s3.service = minio -s3.endpoint = http://minio:9000 -s3.region = -s3.access_key_id = MinioUser -s3.secret_key = OpenSesame -s3.bucket = test.cantaloupe.library.illinois.edu - -redis.host = redis -redis.port = 7230 -redis.ssl = false -redis.password = -redis.database = 0 diff --git a/docker/Windows-JDK17/Dockerfile b/docker/Windows-JDK17/Dockerfile index f3726f23b..c75f28304 100644 --- a/docker/Windows-JDK17/Dockerfile +++ b/docker/Windows-JDK17/Dockerfile @@ -15,7 +15,7 @@ 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 +#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32 # Install KakaduNativeProcessor dependencies COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/ @@ -25,5 +25,5 @@ COPY pom.xml pom.xml RUN mvn dependency:resolve # Copy the code -COPY docker/Windows-JDK11/image_files/test.properties test.properties +COPY docker/image_files/test.properties test.properties COPY src src diff --git a/docker/Windows-JDK18/Dockerfile b/docker/Windows-JDK18/Dockerfile index e3f570efc..4a8794818 100644 --- a/docker/Windows-JDK18/Dockerfile +++ b/docker/Windows-JDK18/Dockerfile @@ -5,14 +5,14 @@ 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 + 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=18.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 @@ -25,5 +25,5 @@ COPY pom.xml pom.xml RUN mvn dependency:resolve # Copy the code -COPY docker/Windows-JDK11/image_files/test.properties test.properties +COPY docker/image_files/test.properties test.properties COPY src src diff --git a/docker/Windows-JDK21/Dockerfile b/docker/Windows-JDK21/Dockerfile index b6741f4f3..fb2ae20b4 100644 --- a/docker/Windows-JDK21/Dockerfile +++ b/docker/Windows-JDK21/Dockerfile @@ -15,7 +15,7 @@ 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 +#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32 # Install KakaduNativeProcessor dependencies COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/ @@ -25,5 +25,5 @@ COPY pom.xml pom.xml RUN mvn dependency:resolve # Copy the code -COPY docker/Windows-JDK11/image_files/test.properties test.properties +COPY docker/image_files/test.properties test.properties COPY src src diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.a b/docker/image_files/libjpeg-turbo/lib64/libjpeg.a similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.a rename to docker/image_files/libjpeg-turbo/lib64/libjpeg.a diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so b/docker/image_files/libjpeg-turbo/lib64/libjpeg.so similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so rename to docker/image_files/libjpeg-turbo/lib64/libjpeg.so diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so.62 b/docker/image_files/libjpeg-turbo/lib64/libjpeg.so.62 similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so.62 rename to docker/image_files/libjpeg-turbo/lib64/libjpeg.so.62 diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so.62.3.0 b/docker/image_files/libjpeg-turbo/lib64/libjpeg.so.62.3.0 similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libjpeg.so.62.3.0 rename to docker/image_files/libjpeg-turbo/lib64/libjpeg.so.62.3.0 diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.a b/docker/image_files/libjpeg-turbo/lib64/libturbojpeg.a similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.a rename to docker/image_files/libjpeg-turbo/lib64/libturbojpeg.a diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so b/docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so rename to docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0 b/docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0 similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0 rename to docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0 diff --git a/docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 b/docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 similarity index 100% rename from docker/Linux-JDK11/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 rename to docker/image_files/libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 diff --git a/docker/Linux-JDK11/image_files/test.properties b/docker/image_files/test.properties similarity index 100% rename from docker/Linux-JDK11/image_files/test.properties rename to docker/image_files/test.properties