Fix(paperless-ngx): Add missing var and a health check to upstream repo patch
This commit is contained in:
parent
b036c8669a
commit
060434f3c2
@ -1,7 +1,7 @@
|
||||
From 31b7e26f6c4d7111f4f4957996efb9f7a5d06cb9 Mon Sep 17 00:00:00 2001
|
||||
From 42c196c2c0dcbed0101d653e0ed67a3dfc3f1808 Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:17:21 +0200
|
||||
Subject: [PATCH 1/9] refactor(compose): 4 spaces indentation
|
||||
Subject: [PATCH 01/11] refactor(compose): 4 spaces indentation
|
||||
|
||||
---
|
||||
.../compose/docker-compose.postgres-tika.yml | 114 +++++++++---------
|
||||
@ -140,10 +140,11 @@ index a451b00d..7423be72 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 0ebc4e023573bbd7108c3addf2ddb110af93cf55 Mon Sep 17 00:00:00 2001
|
||||
From 6bf9b93ebe48036d67d94a49162c1f6c17eb80de Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:22:06 +0200
|
||||
Subject: [PATCH 2/9] refactor(compose): Harmonize restart and logging settigs
|
||||
Subject: [PATCH 02/11] refactor(compose): Harmonize restart and logging
|
||||
settigs
|
||||
|
||||
---
|
||||
docker/compose/common-settings.yml | 11 ++++++++++
|
||||
@ -229,10 +230,10 @@ index 7423be72..d19c22d7 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 2b9c005a3c1d54900d6646c9c36c7f7e98d3b2a7 Mon Sep 17 00:00:00 2001
|
||||
From 9b7dd19f5c6f410594f35dd233d1d32c9d118dbf Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:28:02 +0200
|
||||
Subject: [PATCH 3/9] refactor(compose): Replace static exposed port with
|
||||
Subject: [PATCH 03/11] refactor(compose): Replace static exposed port with
|
||||
environment variable
|
||||
|
||||
---
|
||||
@ -256,10 +257,10 @@ index d19c22d7..554d9735 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 01a55586aa24f7ab9945f5f1d563970ab0c72290 Mon Sep 17 00:00:00 2001
|
||||
From aee7de3b1adfb30e7f0f2737d567cfc8190d8302 Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:30:47 +0200
|
||||
Subject: [PATCH 4/9] refactor(compose): Harmonize container names
|
||||
Subject: [PATCH 04/11] refactor(compose): Harmonize container names
|
||||
|
||||
---
|
||||
docker/compose/docker-compose.postgres-tika.yml | 5 +++++
|
||||
@ -313,10 +314,11 @@ index 554d9735..10316fc2 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From cddc6e0ddd423ab050362289bb0753867e4f4e10 Mon Sep 17 00:00:00 2001
|
||||
From e600e84d5c6e6c8938498f8cfa8bef32c1aea180 Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:36:29 +0200
|
||||
Subject: [PATCH 5/9] refactor(compose): Replace named volumes with bind mounts
|
||||
Subject: [PATCH 05/11] refactor(compose): Replace named volumes with bind
|
||||
mounts
|
||||
|
||||
---
|
||||
.../compose/docker-compose.postgres-tika.yml | 18 ++++++------------
|
||||
@ -373,10 +375,10 @@ index 10316fc2..eacb76c8 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 68deaf24dd08c39ed2a90759044a9b315c04d22f Mon Sep 17 00:00:00 2001
|
||||
From a1ff3cdfd84a45e0a383168470a5028246577a7d Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:37:44 +0200
|
||||
Subject: [PATCH 6/9] refactor(compose): Introduce dedicated network
|
||||
Subject: [PATCH 06/11] refactor(compose): Introduce dedicated network
|
||||
|
||||
---
|
||||
.../compose/docker-compose.postgres-tika.yml | 21 +++++++++++++++++++
|
||||
@ -446,10 +448,10 @@ index eacb76c8..05885149 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From edfc732eb7c23c51dfa9a370e1a850e7cbef45b2 Mon Sep 17 00:00:00 2001
|
||||
From fd35306130b35d9c4d77a3ca6849e96222a244cb Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:39:23 +0200
|
||||
Subject: [PATCH 7/9] refactor(compose): No double quotes for port variable
|
||||
Subject: [PATCH 07/11] refactor(compose): No double quotes for port variable
|
||||
needed
|
||||
|
||||
---
|
||||
@ -473,10 +475,10 @@ index 05885149..f1dd4913 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 20da814bbfcc2f5745a82b3fb2fcc9edd4015482 Mon Sep 17 00:00:00 2001
|
||||
From 0defc3f29d607e8c81c655b15fb9e92cf3921fdb Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 22:53:20 +0200
|
||||
Subject: [PATCH 8/9] refactor(compose): Replace hard-linked env file with
|
||||
Subject: [PATCH 08/11] refactor(compose): Replace hard-linked env file with
|
||||
variables
|
||||
|
||||
---
|
||||
@ -510,10 +512,10 @@ index f1dd4913..1a5abbb8 100644
|
||||
2.39.1
|
||||
|
||||
|
||||
From 64beae08ffe8f9a65208e2567919fd75564b95c6 Mon Sep 17 00:00:00 2001
|
||||
From c044e323b9d09a95c782b0a216c02874be52611c Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Tue, 16 May 2023 23:15:26 +0200
|
||||
Subject: [PATCH 9/9] feat(compose): Bind to a virtual IP address
|
||||
Subject: [PATCH 09/11] feat(compose): Bind to a virtual IP address
|
||||
|
||||
---
|
||||
docker/compose/docker-compose.postgres-tika.yml | 2 +-
|
||||
@ -535,3 +537,76 @@ index 1a5abbb8..3cb20287 100644
|
||||
--
|
||||
2.39.1
|
||||
|
||||
|
||||
From 51744302beb94ff44d348f3abf834e5222aca675 Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Wed, 17 May 2023 23:33:44 +0200
|
||||
Subject: [PATCH 10/11] fix(compose): Apply unpaper, use cleaned images to
|
||||
build output file
|
||||
|
||||
---
|
||||
docker/compose/docker-compose.postgres-tika.yml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml
|
||||
index 3cb20287..ed60ce40 100644
|
||||
--- a/docker/compose/docker-compose.postgres-tika.yml
|
||||
+++ b/docker/compose/docker-compose.postgres-tika.yml
|
||||
@@ -89,6 +89,7 @@ services:
|
||||
PAPERLESS_TIKA_ENABLED: 1
|
||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||
+ PAPERLESS_OCR_CLEAN: ${PAPERLESS_OCR_CLEAN}
|
||||
PAPERLESS_OCR_LANGUAGE: ${PAPERLESS_OCR_LANGUAGE}
|
||||
PAPERLESS_OCR_LANGUAGES: ${PAPERLESS_OCR_LANGUAGES}
|
||||
PAPERLESS_SECRET_KEY: ${PAPERLESS_SECRET_KEY}
|
||||
--
|
||||
2.39.1
|
||||
|
||||
|
||||
From 516c326ba44243c768b94b604d627616c580386c Mon Sep 17 00:00:00 2001
|
||||
From: hygienic-books <>
|
||||
Date: Wed, 17 May 2023 23:37:44 +0200
|
||||
Subject: [PATCH 11/11] fix(compose): Let ping tell us when our virtual IP
|
||||
address is bound
|
||||
|
||||
---
|
||||
docker/compose/docker-compose.postgres-tika.yml | 15 +++++++++++----
|
||||
1 file changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml
|
||||
index ed60ce40..e4e2b895 100644
|
||||
--- a/docker/compose/docker-compose.postgres-tika.yml
|
||||
+++ b/docker/compose/docker-compose.postgres-tika.yml
|
||||
@@ -51,6 +51,12 @@ services:
|
||||
extends:
|
||||
file: common-settings.yml
|
||||
service: common-settings
|
||||
+ healthcheck:
|
||||
+ test: ["CMD", "ping", "-qnc", "1", "-W", "0.2", "${WEBSERVER_VIP}"]
|
||||
+ interval: 2s
|
||||
+ timeout: 2s
|
||||
+ retries: 3
|
||||
+ start_period: 10s
|
||||
volumes:
|
||||
- /opt/docker-data/paperless_ngx-${CONTEXT}/db/data:/var/lib/postgresql/data
|
||||
environment:
|
||||
@@ -67,10 +73,11 @@ services:
|
||||
file: common-settings.yml
|
||||
service: common-settings
|
||||
depends_on:
|
||||
- - db
|
||||
- - broker
|
||||
- - gotenberg
|
||||
- - tika
|
||||
+ db:
|
||||
+ condition: service_healthy
|
||||
+ broker:
|
||||
+ gotenberg:
|
||||
+ tika:
|
||||
ports:
|
||||
- ${WEBSERVER_VIP}:${WEBSERVER_PORT}:8000
|
||||
healthcheck:
|
||||
--
|
||||
2.39.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user