From 044a779a7c0f862872fec64977830cb6cab49b71 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 1 Jan 2024 14:57:52 +0000 Subject: [PATCH] Test files update --- .../docker-compose-latest-lite-security.yml | 8 ++++---- exampleYmlFiles/docker-compose-latest-lite.yml | 8 ++++---- exampleYmlFiles/docker-compose-latest-security.yml | 4 ++-- .../docker-compose-latest-ultra-lite-security.yml | 8 ++++---- exampleYmlFiles/docker-compose-latest-ultra-lite.yml | 8 ++++---- exampleYmlFiles/docker-compose-latest.yml | 2 +- test.sh | 12 ++++++------ 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/exampleYmlFiles/docker-compose-latest-lite-security.yml b/exampleYmlFiles/docker-compose-latest-lite-security.yml index 607931c5..41dc4567 100644 --- a/exampleYmlFiles/docker-compose-latest-lite-security.yml +++ b/exampleYmlFiles/docker-compose-latest-lite-security.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF-Lite-Security - image: frooodle/s-pdf:latest-lite-local + image: frooodle/s-pdf:latest-lite deploy: resources: limits: @@ -22,9 +22,9 @@ services: DOCKER_ENABLE_SECURITY: "true" SECURITY_ENABLELOGIN: "true" SYSTEM_DEFAULTLOCALE: en_US - UI_APPNAME: Stirling-PDF - UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest - UI_APPNAMENAVBAR: Stirling-PDF Latest + UI_APPNAME: Stirling-PDF-Lite + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest with Security + UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" diff --git a/exampleYmlFiles/docker-compose-latest-lite.yml b/exampleYmlFiles/docker-compose-latest-lite.yml index a1d7cac0..7b374688 100644 --- a/exampleYmlFiles/docker-compose-latest-lite.yml +++ b/exampleYmlFiles/docker-compose-latest-lite.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF-Lite - image: frooodle/s-pdf:latest-lite-local + image: frooodle/s-pdf:latest-lite deploy: resources: limits: @@ -21,9 +21,9 @@ services: DOCKER_ENABLE_SECURITY: "false" SECURITY_ENABLELOGIN: "false" SYSTEM_DEFAULTLOCALE: en_US - UI_APPNAME: Stirling-PDF - UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest - UI_APPNAMENAVBAR: Stirling-PDF Latest + UI_APPNAME: Stirling-PDF-Lite + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest + UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" diff --git a/exampleYmlFiles/docker-compose-latest-security.yml b/exampleYmlFiles/docker-compose-latest-security.yml index 8e5fb29b..807a755e 100644 --- a/exampleYmlFiles/docker-compose-latest-security.yml +++ b/exampleYmlFiles/docker-compose-latest-security.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF-Security - image: frooodle/s-pdf:latest-local + image: frooodle/s-pdf:latest deploy: resources: limits: @@ -23,7 +23,7 @@ services: SECURITY_ENABLELOGIN: "true" SYSTEM_DEFAULTLOCALE: en_US UI_APPNAME: Stirling-PDF - UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security UI_APPNAMENAVBAR: Stirling-PDF Latest SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" diff --git a/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml b/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml index a8de634f..7971eeb7 100644 --- a/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml +++ b/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF-Ultra-Lite-Security - image: frooodle/s-pdf:latest-ultra-lite-local + image: frooodle/s-pdf:latest-ultra-lite deploy: resources: limits: @@ -22,9 +22,9 @@ services: DOCKER_ENABLE_SECURITY: "true" SECURITY_ENABLELOGIN: "true" SYSTEM_DEFAULTLOCALE: en_US - UI_APPNAME: Stirling-PDF - UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest - UI_APPNAMENAVBAR: Stirling-PDF Latest + UI_APPNAME: Stirling-PDF-Lite + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest with Security + UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" diff --git a/exampleYmlFiles/docker-compose-latest-ultra-lite.yml b/exampleYmlFiles/docker-compose-latest-ultra-lite.yml index b3ad7b00..31fec67b 100644 --- a/exampleYmlFiles/docker-compose-latest-ultra-lite.yml +++ b/exampleYmlFiles/docker-compose-latest-ultra-lite.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF-Ultra-Lite - image: frooodle/s-pdf:latest-ultra-lite-local + image: frooodle/s-pdf:latest-ultra-lite deploy: resources: limits: @@ -21,9 +21,9 @@ services: DOCKER_ENABLE_SECURITY: "false" SECURITY_ENABLELOGIN: "false" SYSTEM_DEFAULTLOCALE: en_US - UI_APPNAME: Stirling-PDF - UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest - UI_APPNAMENAVBAR: Stirling-PDF Latest + UI_APPNAME: Stirling-PDF-Ultra-lite + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Ultra-lite Latest + UI_APPNAMENAVBAR: Stirling-PDF-Ultra-lite Latest SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" diff --git a/exampleYmlFiles/docker-compose-latest.yml b/exampleYmlFiles/docker-compose-latest.yml index 22ea3074..a9dc1f31 100644 --- a/exampleYmlFiles/docker-compose-latest.yml +++ b/exampleYmlFiles/docker-compose-latest.yml @@ -2,7 +2,7 @@ version: '3.3' services: stirling-pdf: container_name: Stirling-PDF - image: frooodle/s-pdf:latest-local + image: frooodle/s-pdf:latest deploy: resources: limits: diff --git a/test.sh b/test.sh index 130c6741..cf03796c 100644 --- a/test.sh +++ b/test.sh @@ -72,9 +72,9 @@ main() { ./gradlew clean build # Building Docker images - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-local -f ./Dockerfile . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-lite-local -f ./Dockerfile-lite . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite-local -f ./Dockerfile-ultra-lite . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-lite -f ./Dockerfile-lite . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . # Test each configuration run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" @@ -85,9 +85,9 @@ main() { ./gradlew clean build # Building Docker images with security enabled - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-local -f ./Dockerfile . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-lite-local -f ./Dockerfile-lite . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite-local -f ./Dockerfile-ultra-lite . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-lite -f ./Dockerfile-lite . + docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . # Test each configuration with security run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml"