From 8be11cb3d9f9a756e6c885e675bf20e5317db923 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Thu, 20 Mar 2025 08:19:45 +0000 Subject: [PATCH] some cleanups --- .../SPDF/controller/api/misc/CompressController.java | 5 +++-- testing/test.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java index 64c8dd896..92b9a29f3 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java @@ -45,6 +45,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -52,7 +53,6 @@ import stirling.software.SPDF.config.EndpointConfiguration; import stirling.software.SPDF.model.api.misc.OptimizePdfRequest; import stirling.software.SPDF.service.CustomPDFDocumentFactory; import stirling.software.SPDF.utils.GeneralUtils; -import stirling.software.SPDF.utils.ImageProcessingUtils; import stirling.software.SPDF.utils.ProcessExecutor; import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult; import stirling.software.SPDF.utils.WebResponseUtils; @@ -82,6 +82,7 @@ public class CompressController { } @Data + @EqualsAndHashCode(callSuper = true) @AllArgsConstructor @NoArgsConstructor private static class NestedImageReference extends ImageReference { @@ -168,7 +169,7 @@ public class CompressController { // Process direct image if (isImage(xobj)) { - addDirectImage(pageNum, name, (PDImageXObject) xobj, uniqueImages); + addDirectImage(pageNum, name, (PDImageXObject) xobj, uniqueImages); log.info( "Found direct image '{}' on page {} - {}x{}", name.getName(), diff --git a/testing/test.sh b/testing/test.sh index 480b4fb01..f17203182 100644 --- a/testing/test.sh +++ b/testing/test.sh @@ -212,6 +212,8 @@ main() { cd "$PROJECT_ROOT" + export DOCKER_CLI_EXPERIMENTAL=enabled + export COMPOSE_DOCKER_CLI_BUILD=0 export DOCKER_ENABLE_SECURITY=false # Run the gradlew build command and check if it fails if ! ./gradlew clean build; then @@ -250,7 +252,7 @@ main() { # Building Docker images with security enabled # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile . # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite . - docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat . # Test each configuration with security