From eefece317335f038860f0f962ccf27313f4e63ef Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Fri, 7 Jul 2023 12:40:44 +0200
Subject: [PATCH 1/5] feat: add first Miniflux definition

---
 rss/docker-compose.yml | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 rss/docker-compose.yml

diff --git a/rss/docker-compose.yml b/rss/docker-compose.yml
new file mode 100644
index 0000000..69ae423
--- /dev/null
+++ b/rss/docker-compose.yml
@@ -0,0 +1,47 @@
+version: '3.9'
+services:
+  rss:
+    image: miniflux/miniflux:latest
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
+    depends_on:
+      db:
+        condition: service_healthy
+      morss:
+        condition: service_healthy
+    environment:
+      - RUN_MIGRATIONS=1
+  db:
+    image: postgres:15-alpine
+    restart: unless-stopped
+    environment:
+    volumes:
+      - db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "miniflux"]
+      interval: 10s
+      start_period: 30s
+  morss:
+    image: pictuga/morss:latest
+    restart: unless-stopped
+    environment:
+      - MAX_TIME=10
+      - MAX_ITEM=-1
+      - LIM_TIME=120
+      - LIM_ITEM=-1
+      - CACHE=diskcache
+      - CACHE_SIZE=2048000000
+    healthcheck:
+      test: ["CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8000"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+volumes:
+  db:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: "/srv/docker/rss/db"
-- 
2.40.1


From b60f84ee7b81b7f99ad2a1603ea8d055c9b9b49c Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Fri, 7 Jul 2023 12:47:17 +0200
Subject: [PATCH 2/5] feat: add networking and logging limits

---
 rss/docker-compose.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/rss/docker-compose.yml b/rss/docker-compose.yml
index 69ae423..eecf6c8 100644
--- a/rss/docker-compose.yml
+++ b/rss/docker-compose.yml
@@ -12,6 +12,14 @@ services:
         condition: service_healthy
     environment:
       - RUN_MIGRATIONS=1
+    networks:
+      - internal
+      - proxy
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
   db:
     image: postgres:15-alpine
     restart: unless-stopped
@@ -22,6 +30,13 @@ services:
       test: ["CMD", "pg_isready", "-U", "miniflux"]
       interval: 10s
       start_period: 30s
+    networks:
+      - internal
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
   morss:
     image: pictuga/morss:latest
     restart: unless-stopped
@@ -38,6 +53,14 @@ services:
       timeout: 10s
       retries: 3
       start_period: 30s
+    networks:
+      - internal
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
+
 volumes:
   db:
     driver: local
@@ -45,3 +68,10 @@ volumes:
       type: none
       o: bind
       device: "/srv/docker/rss/db"
+
+networks:
+  internal:
+    ipam:
+      driver: default
+  proxy:
+    external: true
-- 
2.40.1


From 90f06e0801db04a931300ce2397b48ad25342a4e Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Fri, 7 Jul 2023 12:50:26 +0200
Subject: [PATCH 3/5] fix: remove extra yaml entry

---
 rss/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rss/docker-compose.yml b/rss/docker-compose.yml
index eecf6c8..f53b52d 100644
--- a/rss/docker-compose.yml
+++ b/rss/docker-compose.yml
@@ -23,7 +23,6 @@ services:
   db:
     image: postgres:15-alpine
     restart: unless-stopped
-    environment:
     volumes:
       - db:/var/lib/postgresql/data
     healthcheck:
-- 
2.40.1


From 541ebcdd32a286da82635734881e6b397c77ab4d Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Fri, 7 Jul 2023 12:54:20 +0200
Subject: [PATCH 4/5] fix: env file not loaded

---
 rss/docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rss/docker-compose.yml b/rss/docker-compose.yml
index f53b52d..29338ac 100644
--- a/rss/docker-compose.yml
+++ b/rss/docker-compose.yml
@@ -12,6 +12,8 @@ services:
         condition: service_healthy
     environment:
       - RUN_MIGRATIONS=1
+    env_file:
+      - .env
     networks:
       - internal
       - proxy
@@ -25,6 +27,8 @@ services:
     restart: unless-stopped
     volumes:
       - db:/var/lib/postgresql/data
+    env_file:
+      - .env
     healthcheck:
       test: ["CMD", "pg_isready", "-U", "miniflux"]
       interval: 10s
-- 
2.40.1


From 6ce9bf9db4ee0365c106c99f89c21020989f96dc Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Fri, 7 Jul 2023 12:56:16 +0200
Subject: [PATCH 5/5] fix: healthcheck

---
 rss/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rss/docker-compose.yml b/rss/docker-compose.yml
index 29338ac..4ad7475 100644
--- a/rss/docker-compose.yml
+++ b/rss/docker-compose.yml
@@ -30,7 +30,7 @@ services:
     env_file:
       - .env
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "miniflux"]
+      test: ["CMD", "pg_isready", "-U", "rss"]
       interval: 10s
       start_period: 30s
     networks:
-- 
2.40.1