Quico/containers
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix(paperless-ngx): Fix long-form depends_on

Browse Source
This commit is contained in:
hygienic-books 2023-05-18 02:07:37 +02:00
parent 327fabbfc0
commit 3fa4c2240c
1 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
paperless_ngx/paperless_ngx.patch
View File

@ -1,7 +1,7 @@
From 42c196c2c0dcbed0101d653e0ed67a3dfc3f1808 Mon Sep 17 00:00:00 2001 From 42c196c2c0dcbed0101d653e0ed67a3dfc3f1808 Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:17:21 +0200 Date: Tue, 16 May 2023 22:17:21 +0200
Subject: [PATCH 01/11] refactor(compose): 4 spaces indentation Subject: [PATCH 01/12] refactor(compose): 4 spaces indentation
--- ---
.../compose/docker-compose.postgres-tika.yml | 114 +++++++++--------- .../compose/docker-compose.postgres-tika.yml | 114 +++++++++---------
@ -143,7 +143,7 @@ index a451b00d..7423be72 100644
From 6bf9b93ebe48036d67d94a49162c1f6c17eb80de Mon Sep 17 00:00:00 2001 From 6bf9b93ebe48036d67d94a49162c1f6c17eb80de Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:22:06 +0200 Date: Tue, 16 May 2023 22:22:06 +0200
Subject: [PATCH 02/11] refactor(compose): Harmonize restart and logging Subject: [PATCH 02/12] refactor(compose): Harmonize restart and logging
settigs settigs
--- ---
@ -233,7 +233,7 @@ index 7423be72..d19c22d7 100644
From 9b7dd19f5c6f410594f35dd233d1d32c9d118dbf Mon Sep 17 00:00:00 2001 From 9b7dd19f5c6f410594f35dd233d1d32c9d118dbf Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:28:02 +0200 Date: Tue, 16 May 2023 22:28:02 +0200
Subject: [PATCH 03/11] refactor(compose): Replace static exposed port with Subject: [PATCH 03/12] refactor(compose): Replace static exposed port with
environment variable environment variable
--- ---
@ -260,7 +260,7 @@ index d19c22d7..554d9735 100644
From aee7de3b1adfb30e7f0f2737d567cfc8190d8302 Mon Sep 17 00:00:00 2001 From aee7de3b1adfb30e7f0f2737d567cfc8190d8302 Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:30:47 +0200 Date: Tue, 16 May 2023 22:30:47 +0200
Subject: [PATCH 04/11] refactor(compose): Harmonize container names Subject: [PATCH 04/12] refactor(compose): Harmonize container names
--- ---
docker/compose/docker-compose.postgres-tika.yml | 5 +++++ docker/compose/docker-compose.postgres-tika.yml | 5 +++++
@ -317,7 +317,7 @@ index 554d9735..10316fc2 100644
From e600e84d5c6e6c8938498f8cfa8bef32c1aea180 Mon Sep 17 00:00:00 2001 From e600e84d5c6e6c8938498f8cfa8bef32c1aea180 Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:36:29 +0200 Date: Tue, 16 May 2023 22:36:29 +0200
Subject: [PATCH 05/11] refactor(compose): Replace named volumes with bind Subject: [PATCH 05/12] refactor(compose): Replace named volumes with bind
mounts mounts
--- ---
@ -378,7 +378,7 @@ index 10316fc2..eacb76c8 100644
From a1ff3cdfd84a45e0a383168470a5028246577a7d Mon Sep 17 00:00:00 2001 From a1ff3cdfd84a45e0a383168470a5028246577a7d Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:37:44 +0200 Date: Tue, 16 May 2023 22:37:44 +0200
Subject: [PATCH 06/11] refactor(compose): Introduce dedicated network Subject: [PATCH 06/12] refactor(compose): Introduce dedicated network
--- ---
.../compose/docker-compose.postgres-tika.yml | 21 +++++++++++++++++++ .../compose/docker-compose.postgres-tika.yml | 21 +++++++++++++++++++
@ -451,7 +451,7 @@ index eacb76c8..05885149 100644
From fd35306130b35d9c4d77a3ca6849e96222a244cb Mon Sep 17 00:00:00 2001 From fd35306130b35d9c4d77a3ca6849e96222a244cb Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:39:23 +0200 Date: Tue, 16 May 2023 22:39:23 +0200
Subject: [PATCH 07/11] refactor(compose): No double quotes for port variable Subject: [PATCH 07/12] refactor(compose): No double quotes for port variable
needed needed
--- ---
@ -478,7 +478,7 @@ index 05885149..f1dd4913 100644
From 0defc3f29d607e8c81c655b15fb9e92cf3921fdb Mon Sep 17 00:00:00 2001 From 0defc3f29d607e8c81c655b15fb9e92cf3921fdb Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 22:53:20 +0200 Date: Tue, 16 May 2023 22:53:20 +0200
Subject: [PATCH 08/11] refactor(compose): Replace hard-linked env file with Subject: [PATCH 08/12] refactor(compose): Replace hard-linked env file with
variables variables
--- ---
@ -515,7 +515,7 @@ index f1dd4913..1a5abbb8 100644
From c044e323b9d09a95c782b0a216c02874be52611c Mon Sep 17 00:00:00 2001 From c044e323b9d09a95c782b0a216c02874be52611c Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Tue, 16 May 2023 23:15:26 +0200 Date: Tue, 16 May 2023 23:15:26 +0200
Subject: [PATCH 09/11] feat(compose): Bind to a virtual IP address Subject: [PATCH 09/12] feat(compose): Bind to a virtual IP address
--- ---
docker/compose/docker-compose.postgres-tika.yml | 2 +- docker/compose/docker-compose.postgres-tika.yml | 2 +-
@ -541,7 +541,7 @@ index 1a5abbb8..3cb20287 100644
From 51744302beb94ff44d348f3abf834e5222aca675 Mon Sep 17 00:00:00 2001 From 51744302beb94ff44d348f3abf834e5222aca675 Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Wed, 17 May 2023 23:33:44 +0200 Date: Wed, 17 May 2023 23:33:44 +0200
Subject: [PATCH 10/11] fix(compose): Apply unpaper, use cleaned images to Subject: [PATCH 10/12] fix(compose): Apply unpaper, use cleaned images to
build output file build output file
--- ---
@ -567,7 +567,7 @@ index 3cb20287..ed60ce40 100644
From 516c326ba44243c768b94b604d627616c580386c Mon Sep 17 00:00:00 2001 From 516c326ba44243c768b94b604d627616c580386c Mon Sep 17 00:00:00 2001
From: hygienic-books <> From: hygienic-books <>
Date: Wed, 17 May 2023 23:37:44 +0200 Date: Wed, 17 May 2023 23:37:44 +0200
Subject: [PATCH 11/11] fix(compose): Let ping tell us when our virtual IP Subject: [PATCH 11/12] fix(compose): Let ping tell us when our virtual IP
address is bound address is bound
--- ---
@ -610,3 +610,32 @@ index ed60ce40..e4e2b895 100644
-- --
2.39.1 2.39.1
From 249e2190fba5abd4a13c1311fe089936c3affe87 Mon Sep 17 00:00:00 2001
From: hygienic-books <>
Date: Wed, 17 May 2023 23:51:15 +0200
Subject: [PATCH 12/12] fix(compose): Unify depends_on
---
docker/compose/docker-compose.postgres-tika.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml
index e4e2b895..d3ec434d 100644
--- a/docker/compose/docker-compose.postgres-tika.yml
+++ b/docker/compose/docker-compose.postgres-tika.yml
@@ -76,8 +76,11 @@ services:
db:
condition: service_healthy
broker:
+ condition: service_started
gotenberg:
+ condition: service_started
tika:
+ condition: service_started
ports:
- ${WEBSERVER_VIP}:${WEBSERVER_PORT}:8000
healthcheck:
--
2.39.1