feat: add backupbot v2 labels to admin (sqlite /data) and imap (mail /mail) services; bump recipe version to 3.0.2+2024.06.52

.env.sample

@@ -198,5 +198,3 @@ REJECT_UNLISTED_RECIPIENT=
 # NOTE(3wc): Other values are not supported, as compose.yml does not contain
 # configuration for them. Pull requests welcome!
 DB_FLAVOR=sqlite
-
-ENABLE_BACKUPS=true

README.md

@@ -4,10 +4,10 @@ Coöp Cloud + [Mailu][Mailu] = 🥳
 
 <!-- metadata -->
 * **Category**: Apps
-* **Status**: 2, beta
+* **Status**: 1, alpha
 * **Image**: [`mailu/*`](https://hub.docker.com/r/mailu/), 4, upstream
 * **Healthcheck**: No
-* **Backups**: Yes
+* **Backups**: No
 * **Email**: N/A
 * **Tests**: No
 * **SSO**: No

abra.sh

@@ -1,4 +1,3 @@
 export CERTDUMPER_POST_VERSION=v1
 export POSTFIX_OVERRIDE_VERSION=v17
 export SENDER_LOGIN_VERSIONS=v2
-export BACKUP_SQLITE_VERSION=v1

backup_sqlite.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-import os
-import sqlite3
-from pathlib import Path
-
-source_path = Path("/data/main.db")
-backup_dir = Path("/data/backup")
-temporary_path = backup_dir / "main.db.tmp"
-backup_path = backup_dir / "main.db"
-
-os.umask(0o077)
-backup_dir.mkdir(mode=0o700, parents=True, exist_ok=True)
-temporary_path.unlink(missing_ok=True)
-
-try:
-    # Read-only mode prevents silently creating an empty source database.
-    source = sqlite3.connect(
-        f"{source_path.as_uri()}?mode=ro",
-        uri=True,
-        timeout=60,
-    )
-    destination = sqlite3.connect(temporary_path)
-    try:
-        source.backup(destination, pages=256, sleep=0.1)
-        result = destination.execute("PRAGMA integrity_check").fetchall()
-        if result != [("ok",)]:
-            raise RuntimeError(f"SQLite integrity check failed: {result}")
-    finally:
-        destination.close()
-        source.close()
-    # Only publish a fully written, verified snapshot.
-    os.replace(temporary_path, backup_path)
-    print(f"SQLite backup ready: {backup_path}", flush=True)
-except Exception:
-    temporary_path.unlink(missing_ok=True)
-    raise

compose.yml

@@ -55,7 +55,7 @@ x-environment:
 
 services:
   app:
-    image: ghcr.io/mailu/nginx:2024.06.67
+    image: ghcr.io/mailu/nginx:2024.06.52
     logging:
       driver: json-file
     networks:
@@ -96,18 +96,15 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "coop-cloud.${STACK_NAME}.version=4.0.0+2024.06.67"
-        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "backupbot.backup.volumes.traefik_letsencrypt=false"
-        - "backupbot.backup.volumes.mailu.path=backup"
+        - "coop-cloud.${STACK_NAME}.version=3.0.2+2024.06.52"
   
   db:
-    image: redis:8.10.2-alpine
+    image: redis:8.0.6-alpine
     volumes:
       - "redis:/data"
 
   admin:
-    image: ghcr.io/mailu/admin:2024.06.67
+    image: ghcr.io/mailu/admin:2024.06.52
     environment: *default-env
     healthcheck:
       disable: true
@@ -118,16 +115,13 @@ services:
       - "mailu:/data"
     networks:
       - default
-    configs:
-      - source: backup_sqlite
-        target: /usr/local/bin/backup_sqlite.py
-        mode: 0444
     deploy:
       labels:
-        backupbot.backup.pre-hook: "python3 /usr/local/bin/backup_sqlite.py"
+        backupbot.backup: "true"
+        backupbot.backup.path: "/data" 
 
   imap:
-    image: ghcr.io/mailu/dovecot:2024.06.67
+    image: ghcr.io/mailu/dovecot:2024.06.52
     environment: *default-env
     secrets:
       - secret_key
@@ -139,9 +133,13 @@ services:
       - app
     networks:
       - default
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.path: "/mail" 
 
   smtp:
-    image: ghcr.io/mailu/postfix:2024.06.67
+    image: ghcr.io/mailu/postfix:2024.06.52
     environment: *default-env
     secrets:
       - secret_key
@@ -153,7 +151,7 @@ services:
       - app
 
   antispam:
-    image: ghcr.io/mailu/rspamd:2024.06.67
+    image: ghcr.io/mailu/rspamd:2024.06.52
     environment: *default-env
     secrets:
       - secret_key
@@ -164,7 +162,7 @@ services:
       disable: true
 
   webmail:
-    image: ghcr.io/mailu/webmail:2024.06.67
+    image: ghcr.io/mailu/webmail:2024.06.52
     # entrypoint: "tail -f /dev/null"
     environment: *default-env
     networks:
@@ -179,7 +177,7 @@ services:
       disable: true
 
   certdumper:
-    image: ldez/traefik-certs-dumper:v2.11.4
+    image: ldez/traefik-certs-dumper:v2.11.2
     entrypoint: sh -c '
       apk add jq
       ; while ! [ -e /traefik/${ACME_JSON} ]
@@ -231,12 +229,9 @@ configs:
   certdumper_post:
     name: ${STACK_NAME}_certdumper_post_${CERTDUMPER_POST_VERSION}
     file: certdumper_post.sh
-  backup_sqlite:
-    name: ${STACK_NAME}_backup_sqlite_${BACKUP_SQLITE_VERSION}
-    file: backup_sqlite.py
-
 
 secrets:
   secret_key:
     external: true
     name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
+

release/3.2.0+2024.06.61

@@ -1 +0,0 @@
-Contains mitigation measures for php2shell

release/3.2.1+2024.06.66

@@ -1 +0,0 @@
-Actual mitigation for php2shell pending further alpine image upgrades

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
-}