Add stop_grace_period of 60s to all containers

README.md

@@ -23,7 +23,7 @@
 1. Clone this repository:
 
     ```console
-    $ git clone -b v2.1.4 --single-branch https://github.com/plausible/community-edition plausible-ce
+    $ git clone -b v2.1.5 --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.

clickhouse/low-resources.xml

@@ -5,7 +5,7 @@
     <mark_cache_size>524288000</mark_cache_size>
 
     <profile>
-        <detault>
+        <default>
             <!-- https://clickhouse.com/docs/en/operations/settings/settings#max_threads -->
             <max_threads>1</max_threads>
             <!-- https://clickhouse.com/docs/en/operations/settings/settings#max_block_size -->
@@ -18,6 +18,6 @@
             <!--
             https://clickhouse.com/docs/en/operations/settings/settings#output_format_parallel_formatting -->
             <output_format_parallel_formatting>0</output_format_parallel_formatting>
-        </detault>
+        </default>
     </profile>
 </clickhouse>

compose.override.yml

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

compose.yml

@@ -1,9 +1,10 @@
 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:
@@ -11,11 +12,12 @@ services:
       start_period: 1m
 
   plausible_events_db:
-    image: clickhouse/clickhouse-server:24.9.3.128-alpine
+    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.
@@ -32,7 +34,8 @@ services:
       start_period: 1m
 
   plausible:
-    image: ghcr.io/plausible/community-edition:v2.1.4
+    image: ghcr.io/plausible/community-edition:v2.1.5
+    stop_grace_period: 60s
     restart: always
     command: sh -c "/entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:
@@ -41,7 +44,7 @@ services:
       plausible_events_db:
         condition: service_healthy
     volumes:
-      - plausible-data:/var/lib/plausible
+      - ./data/plausible:/var/lib/plausible
     ulimits:
       nofile:
         soft: 65535
@@ -85,9 +88,3 @@ services:
       - MAILGUN_BASE_URI
       - MANDRILL_API_KEY
       - SENDGRID_API_KEY
-
-volumes:
-  db-data:
-  event-data:
-  event-logs:
-  plausible-data: