From 144ab603b78cfaa73cc319794afdbe0a9fe09c11 Mon Sep 17 00:00:00 2001 From: Dario Ghunney Ware Date: Thu, 2 Jan 2025 11:59:22 +0000 Subject: [PATCH] cleanup --- ...r-compose-latest-fat-security-postgres.yml | 63 +++++++++++++++++++ .../docker-compose-latest-fat-security.yml | 7 --- ...ocker-compose-latest-security-with-sso.yml | 4 -- .../docker-compose-latest-security.yml | 6 -- ...ker-compose-latest-ultra-lite-security.yml | 4 -- exampleYmlFiles/docker-compose-postgres.yml | 18 ------ 6 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml delete mode 100644 exampleYmlFiles/docker-compose-postgres.yml diff --git a/exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml b/exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml new file mode 100644 index 000000000..f568a2646 --- /dev/null +++ b/exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml @@ -0,0 +1,63 @@ +services: + stirling-pdf: + container_name: Stirling-PDF-Security-Fat-Postgres + image: stirlingtools/stirling-pdf:latest-fat + deploy: + resources: + limits: + memory: 4G + depends_on: + - db + healthcheck: + test: [ "CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP'" ] + interval: 5s + timeout: 10s + retries: 16 + ports: + - 8080:8080 + volumes: + - ./stirling/latest/data:/usr/share/tessdata:rw + - ./stirling/latest/config:/configs:rw + - ./stirling/latest/logs:/logs:rw + environment: + DOCKER_ENABLE_SECURITY: "true" + SECURITY_ENABLELOGIN: "false" + PUID: 1002 + PGID: 1002 + UMASK: "022" + SYSTEM_DEFAULTLOCALE: en-US + UI_APPNAME: Stirling-PDF + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest-fat with Security + UI_APPNAMENAVBAR: Stirling-PDF Latest-fat + SYSTEM_MAXFILESIZE: "100" + METRICS_ENABLED: "true" + SYSTEM_GOOGLEVISIBILITY: "true" + SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true" + SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf" + SYSTEM_DATASOURCE_USERNAME: "admin" + SYSTEM_DATASOURCE_PASSWORD: "stirling" + restart: on-failure:5 + + db: + image: 'postgres:17.2-alpine' + restart: on-failure:5 + container_name: db + ports: + - "5432:5432" + environment: + POSTGRES_DB: "stirling_pdf" + POSTGRES_USER: "admin" + POSTGRES_PASSWORD: "stirling" + shm_size: "512mb" + deploy: + resources: + limits: + memory: 512m + cpus: "0.5" + healthcheck: + test: [ "CMD-SHELL", "pg_isready -U admin stirling_pdf" ] + interval: 1s + timeout: 5s + retries: 10 + volumes: + - ./stirling/latest/data:/var/lib/postgresql/data \ No newline at end of file diff --git a/exampleYmlFiles/docker-compose-latest-fat-security.yml b/exampleYmlFiles/docker-compose-latest-fat-security.yml index 3b5541cbe..a8fedcb24 100644 --- a/exampleYmlFiles/docker-compose-latest-fat-security.yml +++ b/exampleYmlFiles/docker-compose-latest-fat-security.yml @@ -1,6 +1,3 @@ -include: - - docker-compose-postgres.yml - services: stirling-pdf: container_name: Stirling-PDF-Security-Fat @@ -33,8 +30,4 @@ services: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" - SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true" - SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf" - SYSTEM_DATASOURCE_USERNAME: "admin" - SYSTEM_DATASOURCE_PASSWORD: "stirling" restart: on-failure:5 diff --git a/exampleYmlFiles/docker-compose-latest-security-with-sso.yml b/exampleYmlFiles/docker-compose-latest-security-with-sso.yml index 1490d421d..9d30986c6 100644 --- a/exampleYmlFiles/docker-compose-latest-security-with-sso.yml +++ b/exampleYmlFiles/docker-compose-latest-security-with-sso.yml @@ -38,8 +38,4 @@ services: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" - SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true" - SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf" - SYSTEM_DATASOURCE_USERNAME: "admin" - SYSTEM_DATASOURCE_PASSWORD: "stirling" restart: on-failure:5 diff --git a/exampleYmlFiles/docker-compose-latest-security.yml b/exampleYmlFiles/docker-compose-latest-security.yml index db5970474..5f8c977d1 100644 --- a/exampleYmlFiles/docker-compose-latest-security.yml +++ b/exampleYmlFiles/docker-compose-latest-security.yml @@ -6,8 +6,6 @@ services: resources: limits: memory: 4G - depends_on: - - db healthcheck: test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"] interval: 5s @@ -32,8 +30,4 @@ services: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" - SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true" - SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf" - SYSTEM_DATASOURCE_USERNAME: "admin" - SYSTEM_DATASOURCE_PASSWORD: "stirling" restart: on-failure:5 diff --git a/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml b/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml index 0505eff0b..f357e0b96 100644 --- a/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml +++ b/exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml @@ -27,8 +27,4 @@ services: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "true" - SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true" - SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf" - SYSTEM_DATASOURCE_USERNAME: "admin" - SYSTEM_DATASOURCE_PASSWORD: "stirling" restart: on-failure:5 diff --git a/exampleYmlFiles/docker-compose-postgres.yml b/exampleYmlFiles/docker-compose-postgres.yml deleted file mode 100644 index 61729f3c2..000000000 --- a/exampleYmlFiles/docker-compose-postgres.yml +++ /dev/null @@ -1,18 +0,0 @@ -services: - db: - image: 'postgres:17.2-alpine' - restart: on-failure:5 - container_name: db - ports: - - "5432:5432" - environment: - POSTGRES_DB: "stirling_pdf" - POSTGRES_USER: "admin" - POSTGRES_PASSWORD: "stirling" - healthcheck: - test: [ "CMD-SHELL", "pg_isready -U admin stirling_pdf" ] - interval: 1s - timeout: 5s - retries: 10 - volumes: - - ./stirling/latest/data:/pgdata \ No newline at end of file