From f5a4c5ac3f8a4ecc1fac5679fdb65891eefc1b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C3=96zg=C3=BCr?= <226712+halilim@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:27:33 +0300 Subject: [PATCH] Improve service & update logo color --- public/svgs/gramps-web.svg | 26 +++++++++++----------- templates/compose/gramps-web.yaml | 36 ++++++++++++++----------------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/public/svgs/gramps-web.svg b/public/svgs/gramps-web.svg index b5d79d76d..eeef33047 100644 --- a/public/svgs/gramps-web.svg +++ b/public/svgs/gramps-web.svg @@ -73,7 +73,7 @@ inkscape:connector-curvature="0" id="path1087" d="m 175.2367,338.27684 h 31.47905 v -153.9548 h 60.76188" - style="fill:none;stroke:#795649;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> diff --git a/templates/compose/gramps-web.yaml b/templates/compose/gramps-web.yaml index 765a5321d..04a284ff2 100644 --- a/templates/compose/gramps-web.yaml +++ b/templates/compose/gramps-web.yaml @@ -6,17 +6,18 @@ # port: 5000 services: - grampsweb: &grampsweb + grampsweb: image: ghcr.io/gramps-project/grampsweb:latest environment: - GRAMPSWEB_TREE: ${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 - GUNICORN_NUM_WORKERS: ${GUNICORN_NUM_WORKERS:-2} + - SERVICE_URL_GRAMPSWEB_5000 + - GRAMPSWEB_TREE=${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 + - GUNICORN_NUM_WORKERS=${GUNICORN_NUM_WORKERS:-2} depends_on: - grampsweb_redis - volumes: + volumes: &volumes - gramps_users:/app/users # persist user database - gramps_index:/app/indexdir # persist search index - gramps_thumb_cache:/app/thumbnail_cache # persist thumbnails @@ -32,10 +33,16 @@ services: retries: 3 grampsweb_celery: - <<: *grampsweb - container_name: grampsweb_celery + image: ghcr.io/gramps-project/grampsweb:latest + environment: + - GRAMPSWEB_TREE=${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: + <<: *volumes command: celery -A gramps_webapi.celery worker --loglevel=INFO --concurrency=2 healthcheck: test: SECRET_KEY="$(cat secret/secret)" celery -A gramps_webapi.celery status || exit 1 @@ -45,19 +52,8 @@ services: grampsweb_redis: image: docker.io/library/redis:7.2.4-alpine - container_name: grampsweb_redis healthcheck: test: redis-cli ping | grep PONG interval: 5s timeout: 10s retries: 3 - -volumes: - gramps_users: - gramps_index: - gramps_thumb_cache: - gramps_cache: - gramps_secret: - gramps_db: - gramps_media: - gramps_tmp: