Add stop_grace_period of 60s to all containers

README.md

@@ -1,8 +1,8 @@
 <p align="center">
     <picture>
-        <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/plausible/community-edition/refs/heads/v2.1.1/images/logo_dark.svg" width="300">
-        <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/plausible/community-edition/refs/heads/v2.1.1/images/logo_light.svg" width="300">
-        <img src="https://raw.githubusercontent.com/plausible/community-edition/refs/heads/v2.1.1/images/logo_light.svg" width="300">
+        <source media="(prefers-color-scheme: dark)" srcset="https://github.com/plausible/community-edition/blob/v2.1.1/images/logo_dark.svg" width="300">
+        <source media="(prefers-color-scheme: light)" srcset="https://github.com/plausible/community-edition/blob/v2.1.1/images/logo_light.svg" width="300">
+        <img src="https://github.com/plausible/community-edition/blob/v2.1.1/images/logo_light.svg" width="300">
     </picture>
 </p>
 
@@ -23,7 +23,7 @@
 1. Clone this repository:
 
     ```console
-    $ git clone -b v2.1.3 --single-branch https://github.com/plausible/community-edition plausible-ce
+    $ git clone -b v2.1.2 --single-branch https://github.com/plausible/community-edition plausible-ce
     Cloning into 'plausible-ce'...
     remote: Enumerating objects: 13, done.
     remote: Counting objects: 100% (10/10), done.
@@ -78,11 +78,6 @@
 
 1. Visit your instance at `$BASE_URL` and create the first user.
 
-> [!NOTE]
-> Plausible CE is funded by our cloud subscribers.
->
-> If you know someone who might find Plausible useful, we'd appreciate if you'd let them know.
-
 ### Wiki
 
 For more information on installation, upgrades, configuration, and integrations please see our [wiki.](https://github.com/plausible/community-edition/wiki)

compose.override.yml

@@ -0,0 +1,4 @@
+services:
+  plausible:
+    ports:
+      - 127.0.0.1:84:80

compose.yml

@@ -1,21 +1,24 @@
 services:
   plausible_db:
     image: postgres:16-alpine
+    stop_grace_period: 60s
     restart: always
     volumes:
-      - db-data:/var/lib/postgresql/data
+      - ./data/postgres:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=postgres
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
+      start_interval: 2s
       start_period: 1m
 
   plausible_events_db:
     image: clickhouse/clickhouse-server:24.3.3.102-alpine
+    stop_grace_period: 60s
     restart: always
     volumes:
-      - event-data:/var/lib/clickhouse
-      - event-logs:/var/log/clickhouse-server
+      - ./data/clickhouse:/var/lib/clickhouse
+      - ./data/clickhouse-logs:/var/log/clickhouse-server
       - ./clickhouse/logs.xml:/etc/clickhouse-server/config.d/logs.xml:ro
       # This makes ClickHouse bind to IPv4 only, since Docker doesn't enable IPv6 in bridge networks by default.
       # Fixes "Listen [::]:9000 failed: Address family for hostname not supported" warnings.
@@ -25,11 +28,13 @@ services:
         soft: 262144
         hard: 262144
     healthcheck:
-      test: ["CMD-SHELL", "wget --no-verbose --tries=1 -O - http://127.0.0.1:8123/ping || exit 1"]
+      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://127.0.0.1:8123/ping || exit 1"]
+      start_interval: 2s
       start_period: 1m
 
   plausible:
-    image: ghcr.io/plausible/community-edition:v2.1.3
+    image: ghcr.io/plausible/community-edition:v2.1.2
+    stop_grace_period: 60s
     restart: always
     command: sh -c "/entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:
@@ -38,13 +43,12 @@ services:
       plausible_events_db:
         condition: service_healthy
     volumes:
-      - plausible-data:/var/lib/plausible
+      - ./data/plausible:/var/lib/plausible
     ulimits:
       nofile:
         soft: 65535
         hard: 65535
     environment:
-      - TMPDIR=/var/lib/plausible/tmp
       # required: https://github.com/plausible/community-edition/wiki/configuration#required
       - BASE_URL=${BASE_URL}
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
@@ -82,9 +86,3 @@ services:
       - MAILGUN_BASE_URI
       - MANDRILL_API_KEY
       - SENDGRID_API_KEY
-
-volumes:
-  db-data:
-  event-data:
-  event-logs:
-  plausible-data: