From fb66717b435d46da30217f7973d8816ac3ca1600 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sun, 27 Aug 2023 13:45:37 +0100
Subject: [PATCH] docker file testing

---
 Dockerfile            | 23 ++++++++++++++++-------
 Dockerfile-lite       |  3 +++
 Dockerfile-ultra-lite |  3 +++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b406b879..bb466151 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,14 @@
 # Build jbig2enc in a separate stage
 FROM frooodle/stirling-pdf-base:beta4
 
-ARG ENABLE_SECURITY_DEFAULT=false
-ENV ENABLE_SECURITY=$ENABLE_SECURITY_DEFAULT
+ARG VERSION_TAG
+ENV VERSION_TAG=$VERSION_TAG
+
+ENV ENABLE_SECURITY=false
+
+ARG ALPHA=false
+ENV ALPHA=$ALPHA
 
-ARG VERSION_TAG=v0.12.2
 
 # Create scripts folder and copy local scripts
 RUN mkdir /scripts
@@ -17,12 +21,17 @@ COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 RUN fc-cache -f -v
 
 # Depending on the ENABLE_SECURITY flag, download the correct JAR
-RUN if [ "$ENABLE_SECURITY" = "true" ]; then \
-    wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login-$VERSION_TAG.jar; \
+COPY build/libs/*.jar app-temp.jar
+RUN if [ "$ALPHA" = "true" ]; then \
+        mv app-temp.jar app.jar; \
+    elif [ "$ENABLE_SECURITY" = "true" ]; then \
+        wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login-$VERSION_TAG.jar; \
+        rm -f app-temp.jar; \
     else \
-    wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-$VERSION_TAG.jar; \
+        wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-$VERSION_TAG.jar; \
+        rm -f app-temp.jar; \
     fi
-
+    
 # Expose the application port
 EXPOSE 8080
 
diff --git a/Dockerfile-lite b/Dockerfile-lite
index d3968a2a..c75e5571 100644
--- a/Dockerfile-lite
+++ b/Dockerfile-lite
@@ -13,11 +13,14 @@ RUN apt-get update && \
 # Copy the application JAR file
 COPY build/libs/*.jar app.jar
 
+
+
 # Expose the application port
 EXPOSE 8080
 
 # Set environment variables
 ENV GROUPS_TO_REMOVE=Python,OpenCV,OCRmyPDF
+ENV ENABLE_SECURITY=false
 
 # Run the application
 CMD ["java", "-jar", "/app.jar"]
diff --git a/Dockerfile-ultra-lite b/Dockerfile-ultra-lite
index ac8579af..be08689f 100644
--- a/Dockerfile-ultra-lite
+++ b/Dockerfile-ultra-lite
@@ -7,8 +7,11 @@ COPY build/libs/*.jar app.jar
 # Expose the application port
 EXPOSE 8080
 
+
+
 # Set environment variables
 ENV GROUPS_TO_REMOVE=CLI
+ENV ENABLE_SECURITY=false
 
 # Run the application
 CMD ["java", "-jar", "/app.jar"]