Merge pull request #693 from cantaloupe-project/move-image-files

Move image_files to a top level directory
cantaloupe-project · Aug 28, 2024 · d7a833d · d7a833d
2 parents 0c5b1dd + e730ef4
commit d7a833d
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,16 +5,16 @@ 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 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
diff --git 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
@@ -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
@@ -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/...image_files/libjpeg-turbo/lib64/libjpeg.a → ...image_files/libjpeg-turbo/lib64/libjpeg.a b/...image_files/libjpeg-turbo/lib64/libjpeg.a → ...image_files/libjpeg-turbo/lib64/libjpeg.a
diff --git a/...mage_files/libjpeg-turbo/lib64/libjpeg.so → ...mage_files/libjpeg-turbo/lib64/libjpeg.so b/...mage_files/libjpeg-turbo/lib64/libjpeg.so → ...mage_files/libjpeg-turbo/lib64/libjpeg.so
diff --git a/...e_files/libjpeg-turbo/lib64/libjpeg.so.62 → ...e_files/libjpeg-turbo/lib64/libjpeg.so.62 b/...e_files/libjpeg-turbo/lib64/libjpeg.so.62 → ...e_files/libjpeg-turbo/lib64/libjpeg.so.62
diff --git a/...les/libjpeg-turbo/lib64/libjpeg.so.62.3.0 → ...les/libjpeg-turbo/lib64/libjpeg.so.62.3.0 b/...les/libjpeg-turbo/lib64/libjpeg.so.62.3.0 → ...les/libjpeg-turbo/lib64/libjpeg.so.62.3.0
diff --git a/..._files/libjpeg-turbo/lib64/libturbojpeg.a → ..._files/libjpeg-turbo/lib64/libturbojpeg.a b/..._files/libjpeg-turbo/lib64/libturbojpeg.a → ..._files/libjpeg-turbo/lib64/libturbojpeg.a
diff --git a/...files/libjpeg-turbo/lib64/libturbojpeg.so → ...files/libjpeg-turbo/lib64/libturbojpeg.so b/...files/libjpeg-turbo/lib64/libturbojpeg.so → ...files/libjpeg-turbo/lib64/libturbojpeg.so
diff --git a/...les/libjpeg-turbo/lib64/libturbojpeg.so.0 → ...les/libjpeg-turbo/lib64/libturbojpeg.so.0 b/...les/libjpeg-turbo/lib64/libturbojpeg.so.0 → ...les/libjpeg-turbo/lib64/libturbojpeg.so.0
diff --git a/...libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 → ...libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 b/...libjpeg-turbo/lib64/libturbojpeg.so.0.2.0 → ...libjpeg-turbo/lib64/libturbojpeg.so.0.2.0
diff --git a/...r/Linux-JDK11/image_files/test.properties → docker/image_files/test.properties b/...r/Linux-JDK11/image_files/test.properties → docker/image_files/test.properties