From dcc3055e93b249a13c665c354e4874b0d3373c8d Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Wed, 24 Aug 2022 15:23:21 +0100
Subject: [PATCH] Use official distribution of tt-rss

The previous one hasn't been updated in about a year. This one requires a couple extra containers, but is officially supported and maintained.
---
 .../files/tt-rss/docker-compose.yml           | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
index 71a850f..69f946b 100644
--- a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
+++ b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
@@ -1,36 +1,57 @@
 version: "2.3"
 
 services:
-  tt-rss:
-    image: registry.gitlab.com/lunik1/docker-tt-rss:latest
-    environment:
-      - PUID={{ docker_user.id }}
-      - PGID={{ docker_user.id }}
-      - TZ={{ timezone }}
-      - DOCKER_MODS=theorangeone/lsio-mod-more-processes:latest
-
-      - TTRSS_DB_USER=tt-rss
-      - TTRSS_DB_NAME=tt-rss
-      - TTRSS_DB_PASS=tt-rss
-      - TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/
-      - TTRSS_ENABLE_REGISTRATION=false
-      - TTRSS_CHECK_FOR_UPDATES=false
-      - TTRSS_ENABLE_GZIP_OUTPUT=true
-    volumes:
-      - "{{ app_data_dir }}/tt-rss/feed-icons:/config/feed-icons"
-      - ./plugins:/config/plugins.local
+  nginx:
+    image: cthulhoo/ttrss-web-nginx:latest
     restart: unless-stopped
     labels:
       - traefik.enable=true
       - traefik.http.routers.tt-rss.rule=Host(`tt-rss.jakehoward.tech`)
+      - traefik.http.middlewares.add-ttrss.addprefix.prefix=/tt-rss
+      - traefik.http.middlewares.remove-ttrss.stripprefix.prefixes=/tt-rss
+      - traefik.http.routers.tt-rss.middlewares=remove-ttrss,add-ttrss
+    volumes:
+      - /tmp/tt-rss:/var/www/html
+      - "{{ app_data_dir }}/tt-rss/feed-icons:/var/www/html/tt-rss/feed-icons:ro"
     depends_on:
-      - db
-    tmpfs:
-      - /config/log
+      - app
     networks:
       - default
       - traefik
 
+  app: &app
+    image: cthulhoo/ttrss-fpm-pgsql-static:latest
+    restart: unless-stopped
+    environment:
+      - TTRSS_DB_USER=tt-rss
+      - TTRSS_DB_NAME=tt-rss
+      - TTRSS_DB_PASS=tt-rss
+      - TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/tt-rss/
+      - TTRSS_ENABLE_REGISTRATION=false
+      - TTRSS_CHECK_FOR_UPDATES=false
+      - TTRSS_ENABLE_GZIP_OUTPUT=true
+      - TTRSS_NO_STARTUP_PLUGIN_UPDATES=true
+      - OWNER_UID={{ docker_user.id }}
+      - OWNER_GID={{ docker_user.id }}
+      - PHP_WORKER_MAX_CHILDREN=50
+      - PHP_WORKER_MEMORY_LIMIT=512M
+    volumes:
+      - /tmp/tt-rss:/var/www/html
+      - "{{ app_data_dir }}/tt-rss/feed-icons:/var/www/html/tt-rss/feed-icons"
+      - ./plugins:/var/www/html/tt-rss/plugins.local
+    tmpfs:
+      - /var/www/html/tt-rss/cache/images
+      - /var/www/html/tt-rss/cache/upload
+      - /var/www/html/tt-rss/cache/export
+    depends_on:
+      - db
+
+  updater:
+    <<: *app
+    command: /opt/tt-rss/updater.sh
+    depends_on:
+      - app
+
   db:
     image: postgres:14-alpine
     restart: unless-stopped