From 5a35475e62d3f3ebd3233f9ed0e84c835fd6bf13 Mon Sep 17 00:00:00 2001
From: hygienic-books <hygienic-books@tentic.net>
Date: Mon, 25 May 2026 03:13:25 +0200
Subject: [PATCH] feat(ttrss): Update to new maintainer and PostgreSQL 17

---
 compose.override.yaml |  2 ++
 compose.yaml          | 29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/compose.override.yaml b/compose.override.yaml
index a5b0986..42dab1e 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -41,6 +41,7 @@ services:
             TTRSS_DB_NAME: "${TTRSS_DB_NAME}"
             TTRSS_DB_PASS: "${TTRSS_DB_PASS}"
             TTRSS_DB_USER: "${TTRSS_DB_USER}"
+            TTRSS_DAEMON_UPDATE_LOGIN_LIMIT: "${TTRSS_DAEMON_UPDATE_LOGIN_LIMIT}"
             TTRSS_FORCE_ARTICLE_PURGE: "${TTRSS_FORCE_ARTICLE_PURGE}"
             TTRSS_SINGLE_USER_MODE: "${TTRSS_SINGLE_USER_MODE}"
             TTRSS_SELF_URL_PATH: "${TTRSS_SELF_URL_PATH}"
@@ -72,6 +73,7 @@ services:
             TTRSS_DB_NAME: "${TTRSS_DB_NAME}"
             TTRSS_DB_PASS: "${TTRSS_DB_PASS}"
             TTRSS_DB_USER: "${TTRSS_DB_USER}"
+            TTRSS_DAEMON_UPDATE_LOGIN_LIMIT: "${TTRSS_DAEMON_UPDATE_LOGIN_LIMIT}"
             TTRSS_FORCE_ARTICLE_PURGE: "${TTRSS_FORCE_ARTICLE_PURGE}"
             TTRSS_SINGLE_USER_MODE: "${TTRSS_SINGLE_USER_MODE}"
             TTRSS_SELF_URL_PATH: "${TTRSS_SELF_URL_PATH}"
diff --git a/compose.yaml b/compose.yaml
index 91ab55e..d754364 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,13 +1,6 @@
-# This Compose file comes from https://tt-rss.org/wiki/InstallationNotes/ last retrieved on 2025-02-11.
-
-version: '3'
-
 services:
-
-  # see FAQ entry below if upgrading from a different PostgreSQL major version (e.g. 12 to 15):
-  # https://tt-rss.org/wiki/InstallationNotes/#i-got-the-updated-compose-file-above-and-now-my-database-keeps-restarting
   db:
-    image: postgres:15-alpine
+    image: postgres:17-alpine
     restart: unless-stopped
     env_file:
       - .env
@@ -17,9 +10,13 @@ services:
       - POSTGRES_DB=${TTRSS_DB_NAME}
     volumes:
       - db:/var/lib/postgresql/data
+      # or, if 18+
+      # - db:/var/lib/postgresql
 
   app:
-    image: cthulhoo/ttrss-fpm-pgsql-static:latest
+    image: supahgreg/tt-rss:latest
+    # or
+    # image: ghcr.io/tt-rss/tt-rss:latest
     restart: unless-stopped
     env_file:
       - .env
@@ -31,7 +28,9 @@ services:
 
 #  optional, makes weekly backups of your install
 #  backups:
-#    image: cthulhoo/ttrss-fpm-pgsql-static:latest
+#    image: supahgreg/tt-rss:latest
+#    # or
+#    # image: ghcr.io/tt-rss/tt-rss:latest
 #    restart: unless-stopped
 #    env_file:
 #      - .env
@@ -43,7 +42,9 @@ services:
 #    command: /opt/tt-rss/dcron.sh -f
 
   updater:
-    image: cthulhoo/ttrss-fpm-pgsql-static:latest
+    image: supahgreg/tt-rss:latest
+    # or
+    # image: ghcr.io/tt-rss/tt-rss:latest
     restart: unless-stopped
     env_file:
       - .env
@@ -55,7 +56,9 @@ services:
     command: /opt/tt-rss/updater.sh
 
   web-nginx:
-    image: cthulhoo/ttrss-web-nginx:latest
+    image: supahgreg/tt-rss-web-nginx:latest
+    # or
+    # image: ghcr.io/tt-rss/tt-rss-web-nginx:latest
     restart: unless-stopped
     env_file:
       - .env
@@ -69,4 +72,4 @@ services:
 volumes:
   db:
   app:
-  backups:
\ No newline at end of file
+  backups: