Develop: Add stop_grace_period to compose.yaml service configs

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-10-18 12:42:01 +02:00
parent 5a95d972a8
commit f99466293a
2 changed files with 10 additions and 5 deletions

View File

@@ -159,7 +159,6 @@ services:
## docker compose exec ollama ollama pull gemma3:latest ## docker compose exec ollama ollama pull gemma3:latest
ollama: ollama:
image: ollama/ollama:latest image: ollama/ollama:latest
restart: unless-stopped
stop_grace_period: 15s stop_grace_period: 15s
## Only starts this service if the "all", "ollama", or "vision" profile is specified:: ## Only starts this service if the "all", "ollama", or "vision" profile is specified::
## docker compose --profile ollama up -d ## docker compose --profile ollama up -d

View File

@@ -154,6 +154,7 @@ services:
## Release Notes: https://mariadb.com/kb/en/changes-improvements-in-mariadb-1011/ ## Release Notes: https://mariadb.com/kb/en/changes-improvements-in-mariadb-1011/
mariadb: mariadb:
image: mariadb:11 image: mariadb:11
stop_grace_period: 15s
security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined - seccomp:unconfined
- apparmor:unconfined - apparmor:unconfined
@@ -180,6 +181,7 @@ services:
qdrant: qdrant:
image: qdrant/qdrant:latest image: qdrant/qdrant:latest
profiles: [ "all", "qdrant" ] profiles: [ "all", "qdrant" ]
stop_grace_period: 15s
links: links:
- "traefik:localssl.dev" - "traefik:localssl.dev"
- "traefik:app.localssl.dev" - "traefik:app.localssl.dev"
@@ -208,7 +210,6 @@ services:
## docker compose exec ollama ollama pull gemma3:latest ## docker compose exec ollama ollama pull gemma3:latest
ollama: ollama:
image: ollama/ollama:latest image: ollama/ollama:latest
restart: unless-stopped
stop_grace_period: 10s stop_grace_period: 10s
## Only starts this service if the "all", "ollama", or "vision" profile is specified:: ## Only starts this service if the "all", "ollama", or "vision" profile is specified::
## docker compose --profile ollama up -d ## docker compose --profile ollama up -d
@@ -261,8 +262,7 @@ services:
## see https://github.com/open-webui/open-webui ## see https://github.com/open-webui/open-webui
open-webui: open-webui:
image: ghcr.io/open-webui/open-webui:main image: ghcr.io/open-webui/open-webui:main
restart: unless-stopped stop_grace_period: 10s
stop_grace_period: 5s
## Only starts this service if the "all", "ollama", "open-webui", or "vision" profile is specified:: ## Only starts this service if the "all", "ollama", "open-webui", or "vision" profile is specified::
## docker compose --profile ollama up -d ## docker compose --profile ollama up -d
profiles: [ "all", "ollama", "open-webui", "vision" ] profiles: [ "all", "ollama", "open-webui", "vision" ]
@@ -290,10 +290,10 @@ services:
## see https://github.com/photoprism/photoprism-vision ## see https://github.com/photoprism/photoprism-vision
photoprism-vision: photoprism-vision:
image: photoprism/vision:latest image: photoprism/vision:latest
stop_grace_period: 15s
## Only starts this service if the "all" or "vision" profile is specified:: ## Only starts this service if the "all" or "vision" profile is specified::
## docker compose --profile vision up -d ## docker compose --profile vision up -d
profiles: [ "all", "vision" ] profiles: [ "all", "vision" ]
stop_grace_period: 15s
working_dir: "/app" working_dir: "/app"
links: links:
- "traefik:localssl.dev" - "traefik:localssl.dev"
@@ -322,6 +322,7 @@ services:
## Docs: https://doc.traefik.io/traefik/ ## Docs: https://doc.traefik.io/traefik/
traefik: traefik:
image: photoprism/traefik:latest image: photoprism/traefik:latest
stop_grace_period: 15s
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
ports: ports:
@@ -335,6 +336,7 @@ services:
## Dummy WebDAV Server ## Dummy WebDAV Server
dummy-webdav: dummy-webdav:
image: photoprism/dummy-webdav:240627 image: photoprism/dummy-webdav:240627
stop_grace_period: 15s
environment: environment:
WEBDAV_USERNAME: admin WEBDAV_USERNAME: admin
WEBDAV_PASSWORD: photoprism WEBDAV_PASSWORD: photoprism
@@ -351,6 +353,7 @@ services:
## Dummy OIDC Identity Provider ## Dummy OIDC Identity Provider
dummy-oidc: dummy-oidc:
image: photoprism/dummy-oidc:240627 image: photoprism/dummy-oidc:240627
stop_grace_period: 15s
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.dummy-oidc.loadbalancer.server.port=9998" - "traefik.http.services.dummy-oidc.loadbalancer.server.port=9998"
@@ -365,6 +368,7 @@ services:
## Docs: https://glauth.github.io/docs/ ## Docs: https://glauth.github.io/docs/
dummy-ldap: dummy-ldap:
image: glauth/glauth-plugins:latest image: glauth/glauth-plugins:latest
stop_grace_period: 15s
ports: ports:
- "127.0.0.1:389:389" - "127.0.0.1:389:389"
labels: labels:
@@ -384,6 +388,7 @@ services:
## Login with "user / photoprism" and "admin / photoprism". ## Login with "user / photoprism" and "admin / photoprism".
keycloak: keycloak:
image: quay.io/keycloak/keycloak:25.0 image: quay.io/keycloak/keycloak:25.0
stop_grace_period: 15s
command: "start-dev" # development mode, do not use this in production! command: "start-dev" # development mode, do not use this in production!
links: links:
- "traefik:localssl.dev" - "traefik:localssl.dev"
@@ -415,6 +420,7 @@ services:
## ./photoprism client add --id=cs5cpu17n6gj2qo5 --secret=xcCbOrw6I0vcoXzhnOmXhjpVSyFq0l0e -s metrics -n Prometheus -e 60 -t 1 ## ./photoprism client add --id=cs5cpu17n6gj2qo5 --secret=xcCbOrw6I0vcoXzhnOmXhjpVSyFq0l0e -s metrics -n Prometheus -e 60 -t 1
prometheus: prometheus:
image: prom/prometheus:latest image: prom/prometheus:latest
stop_grace_period: 15s
profiles: [ "all", "auth", "prometheus" ] profiles: [ "all", "auth", "prometheus" ]
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"