From 19a602bac4097c09bc813d46fd25df38404235cf Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:17:47 +0200 Subject: [PATCH 1/8] gramps --- docker-compose/gramps/docker-compose.yml.j2 | 56 +++++++++++++++++++++ host_vars/docker10.mgrote.net.yml | 2 + 2 files changed, 58 insertions(+) create mode 100644 docker-compose/gramps/docker-compose.yml.j2 diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 new file mode 100644 index 00000000..d990d402 --- /dev/null +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -0,0 +1,56 @@ +--- +version: "3.7" + +services: + grampsweb: &grampsweb + image: ghcr.io/gramps-project/grampsweb:latest # version + restart: always + ports: + - "6483:5000" # host:docker + environment: + GRAMPSWEB_TREE: "Gramps Web" # will create a new tree if not exists + GRAMPSWEB_CELERY_CONFIG__broker_url: "redis://grampsweb_redis:6379/0" + GRAMPSWEB_CELERY_CONFIG__result_backend: "redis://grampsweb_redis:6379/0" + GRAMPSWEB_RATELIMIT_STORAGE_URI: redis://grampsweb_redis:6379/1 + depends_on: + - grampsweb_redis + volumes: + - gramps_users:/app/users # persist user database + - gramps_index:/app/indexdir # persist search index + - gramps_thumb_cache:/app/thumbnail_cache # persist thumbnails + - gramps_cache:/app/cache # persist export and report caches + - gramps_secret:/app/secret # persist flask secret + - gramps_db:/root/.gramps/grampsdb # persist Gramps database + - gramps_media:/app/media # persist media files + - gramps_tmp:/tmp + + grampsweb_celery: + <<: *grampsweb # YAML merge key copying the entire grampsweb service config + ports: [] + container_name: grampsweb_celery + depends_on: + - grampsweb_redis + command: celery -A gramps_webapi.celery worker --loglevel=INFO + + grampsweb_redis: + image: redis:7.2.4-alpine + container_name: grampsweb_redis + restart: always + +volumes: + gramps_users: + gramps_index: + gramps_thumb_cache: + gramps_cache: + gramps_secret: + gramps_db: + gramps_media: + gramps_tmp: + + +# healtchecj +# healthcheck: +# test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"] +# interval: 30s +# timeout: 10s +# retries: 3 diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 1365c5d7..41929c7d 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -67,6 +67,8 @@ compose_files: - name: wiki state: present network: traefik + - name: gramps + state: present ### oefenweb.ufw ufw_rules: -- 2.43.0 From 421a68164b2f1004417dee4b488e5271e84bdf0e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:35:40 +0200 Subject: [PATCH 2/8] mail --- docker-compose/gramps/docker-compose.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index d990d402..3f5705f5 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -12,6 +12,10 @@ services: GRAMPSWEB_CELERY_CONFIG__broker_url: "redis://grampsweb_redis:6379/0" GRAMPSWEB_CELERY_CONFIG__result_backend: "redis://grampsweb_redis:6379/0" GRAMPSWEB_RATELIMIT_STORAGE_URI: redis://grampsweb_redis:6379/1 + EMAIL_HOST: "docker10.mgrote.net" + EMAIL_PORT: "1025" + EMAIL_USE_TLS: "false" + DEFAULT_FROM_EMAIL: "gramps@mgrote.net" depends_on: - grampsweb_redis volumes: -- 2.43.0 From 09d6e1744ba587153fdcc40bba47087e519b1b6e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:38:32 +0200 Subject: [PATCH 3/8] h --- docker-compose/gramps/docker-compose.yml.j2 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index 3f5705f5..d54aaa70 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -27,6 +27,11 @@ services: - gramps_db:/root/.gramps/grampsdb # persist Gramps database - gramps_media:/app/media # persist media files - gramps_tmp:/tmp + healthcheck: + test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:5000/"] + interval: 30s + timeout: 10s + retries: 3 grampsweb_celery: <<: *grampsweb # YAML merge key copying the entire grampsweb service config @@ -50,11 +55,3 @@ volumes: gramps_db: gramps_media: gramps_tmp: - - -# healtchecj -# healthcheck: -# test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"] -# interval: 30s -# timeout: 10s -# retries: 3 -- 2.43.0 From 5357ac790f11a9e5e450871165fc9138bea8c4c0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:38:35 +0200 Subject: [PATCH 4/8] n --- docker-compose/gramps/docker-compose.yml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index d54aaa70..fe5dd715 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -3,6 +3,7 @@ version: "3.7" services: grampsweb: &grampsweb + container_name: grampsweb image: ghcr.io/gramps-project/grampsweb:latest # version restart: always ports: -- 2.43.0 From a242d1920ea2966e0fbcb363b4e5aeccb678a99e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:41:56 +0200 Subject: [PATCH 5/8] GRAMPSWEB_ --- docker-compose/gramps/docker-compose.yml.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index fe5dd715..31cb1bef 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -13,10 +13,10 @@ services: GRAMPSWEB_CELERY_CONFIG__broker_url: "redis://grampsweb_redis:6379/0" GRAMPSWEB_CELERY_CONFIG__result_backend: "redis://grampsweb_redis:6379/0" GRAMPSWEB_RATELIMIT_STORAGE_URI: redis://grampsweb_redis:6379/1 - EMAIL_HOST: "docker10.mgrote.net" - EMAIL_PORT: "1025" - EMAIL_USE_TLS: "false" - DEFAULT_FROM_EMAIL: "gramps@mgrote.net" + GRAMPSWEB_EMAIL_HOST: "docker10.mgrote.net" + GRAMPSWEB_EMAIL_PORT: "1025" + GRAMPSWEB_EMAIL_USE_TLS: "false" + GRAMPSWEB_DEFAULT_FROM_EMAIL: "gramps@mgrote.net" depends_on: - grampsweb_redis volumes: @@ -56,3 +56,5 @@ volumes: gramps_db: gramps_media: gramps_tmp: + +# checkliste -- 2.43.0 From f458ab572f1616861e1f7646feb02d62a33018f7 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:50:13 +0200 Subject: [PATCH 6/8] d --- docker-compose/gramps/docker-compose.yml.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index 31cb1bef..ddc43304 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -41,11 +41,18 @@ services: depends_on: - grampsweb_redis command: celery -A gramps_webapi.celery worker --loglevel=INFO + healthcheck: [] + grampsweb_redis: image: redis:7.2.4-alpine container_name: grampsweb_redis restart: always + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 30s + timeout: 10s + retries: 3 volumes: gramps_users: -- 2.43.0 From d84f71adb6954b7a57c6b8532751416f6a42050a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:51:40 +0200 Subject: [PATCH 7/8] f --- docker-compose/gramps/docker-compose.yml.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index ddc43304..a4c45367 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -41,8 +41,7 @@ services: depends_on: - grampsweb_redis command: celery -A gramps_webapi.celery worker --loglevel=INFO - healthcheck: [] - + healthcheck: {} grampsweb_redis: image: redis:7.2.4-alpine -- 2.43.0 From 2d1a17c4da18ce16a06a1cd8e115264fac6146b8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 27 May 2024 11:53:42 +0200 Subject: [PATCH 8/8] v --- docker-compose/gramps/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/gramps/docker-compose.yml.j2 b/docker-compose/gramps/docker-compose.yml.j2 index a4c45367..c9d1c8a7 100644 --- a/docker-compose/gramps/docker-compose.yml.j2 +++ b/docker-compose/gramps/docker-compose.yml.j2 @@ -4,7 +4,7 @@ version: "3.7" services: grampsweb: &grampsweb container_name: grampsweb - image: ghcr.io/gramps-project/grampsweb:latest # version + image: ghcr.io/gramps-project/grampsweb:v24.5.0 # version restart: always ports: - "6483:5000" # host:docker -- 2.43.0