From 2a1dad80f025044167404b92e64fba1282517ea3 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sun, 22 Dec 2024 11:17:22 +0000 Subject: [PATCH] rename --- .github/workflows/push-docker.yml | 6 +++--- DeveloperGuide.md | 8 ++++---- Dockerfile-fat => Dockerfile.fat | 2 +- Dockerfile-ultra-lite => Dockerfile.ultra-lite | 2 +- .../SPDF/config/security/CustomLogoutSuccessHandler.java | 6 +++--- .../SPDF/controller/web/AccountWebController.java | 4 ++-- test.sh | 6 +++--- test2.sh | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename Dockerfile-fat => Dockerfile.fat (96%) rename Dockerfile-ultra-lite => Dockerfile.ultra-lite (94%) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 2ca9a14d..531abf41 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -102,12 +102,12 @@ jobs: type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} - - name: Build and push Dockerfile-ultra-lite + - name: Build and push Dockerfile ultra-lite uses: docker/build-push-action@v6 if: github.ref != 'refs/heads/main' with: context: . - file: ./Dockerfile-ultra-lite + file: ./Dockerfile.ultra-lite push: true cache-from: type=gha cache-to: type=gha,mode=max @@ -136,7 +136,7 @@ jobs: with: builder: ${{ steps.buildx.outputs.name }} context: . - file: ./Dockerfile-fat + file: ./Dockerfile.fat push: true cache-from: type=gha cache-to: type=gha,mode=max diff --git a/DeveloperGuide.md b/DeveloperGuide.md index 66b1751e..1a43b641 100644 --- a/DeveloperGuide.md +++ b/DeveloperGuide.md @@ -86,8 +86,8 @@ Stirling-PDF/ │ └── SPDF/ ├── build.gradle # Gradle build configuration ├── Dockerfile # Main Dockerfile -├── Dockerfile-ultra-lite # Dockerfile for ultra-lite version -├── Dockerfile-fat # Dockerfile for fat version +├── Dockerfile.ultra-lite # Dockerfile for ultra-lite version +├── Dockerfile.fat # Dockerfile for fat version ├── docker-compose.yml # Docker Compose configuration └── test.sh # Test script to deploy all docker versions and run cuke tests ``` @@ -179,14 +179,14 @@ Stirling-PDF uses different Docker images for various configurations. The build For the ultra-lite version: ```bash - 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-ultra-lite -f ./Dockerfile.ultra-lite . ``` For the fat version (with security enabled): ```bash export DOCKER_ENABLE_SECURITY=true - 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 stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat . ``` Note: The `--no-cache` and `--pull` flags ensure that the build process uses the latest base images and doesn't use cached layers, which is useful for testing and ensuring reproducible builds. however to improve build times these can often be removed depending on your usecase diff --git a/Dockerfile-fat b/Dockerfile.fat similarity index 96% rename from Dockerfile-fat rename to Dockerfile.fat index d34c7daa..6720bf9b 100644 --- a/Dockerfile-fat +++ b/Dockerfile.fat @@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \ ./gradlew clean build # Main stage -FROM alpine:3.20.3 +FROM alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 # Copy necessary files COPY scripts /scripts diff --git a/Dockerfile-ultra-lite b/Dockerfile.ultra-lite similarity index 94% rename from Dockerfile-ultra-lite rename to Dockerfile.ultra-lite index 09e4a5a3..4953f338 100644 --- a/Dockerfile-ultra-lite +++ b/Dockerfile.ultra-lite @@ -1,5 +1,5 @@ # use alpine -FROM alpine:3.21.0 +FROM alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 ARG VERSION_TAG diff --git a/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java b/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java index 8d5aa76d..2d022864 100644 --- a/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java +++ b/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java @@ -219,9 +219,9 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue=" // + response.encodeRedirectURL(redirect_url); log.info("Google does not have a specific logout URL"); - // log.info("Redirecting to Google logout URL: " + googleLogoutUrl); - // response.sendRedirect(googleLogoutUrl); - // break; + // log.info("Redirecting to Google logout URL: " + googleLogoutUrl); + // response.sendRedirect(googleLogoutUrl); + // break; default: String defaultRedirectUrl = request.getContextPath() + "/login?" + param; log.info("Redirecting to default logout URL: " + defaultRedirectUrl); diff --git a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java index b4629020..3e478af2 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java @@ -167,8 +167,8 @@ public class AccountWebController { case "invalid_destination": erroroauth = "login.invalid_destination"; break; - // Valid InResponseTo was not available from the validation context, unable to - // evaluate + // Valid InResponseTo was not available from the validation context, unable to + // evaluate case "invalid_in_response_to": erroroauth = "login.invalid_in_response_to"; break; diff --git a/test.sh b/test.sh index 2ad25905..d789c6be 100644 --- a/test.sh +++ b/test.sh @@ -74,7 +74,7 @@ main() { # Building Docker images # 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-ultra-lite -f ./Dockerfile.ultra-lite . # Test each configuration #run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" @@ -94,8 +94,8 @@ 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 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 . # Test each configuration with security diff --git a/test2.sh b/test2.sh index 61db7993..b33d2df8 100644 --- a/test2.sh +++ b/test2.sh @@ -65,7 +65,7 @@ build_and_test() { dockerfile_name="./Dockerfile" ;; ultra-lite) - dockerfile_name="./Dockerfile-ultra-lite" + dockerfile_name="./Dockerfile.ultra-lite" ;; esac