Improve service & update logo color

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: