From d70deed46e8ce47e01e47fd222b6bdad062b109f Mon Sep 17 00:00:00 2001
From: Evsyukov Denis <denis@evsyukov.org>
Date: Fri, 8 Mar 2024 10:14:40 +0300
Subject: [PATCH] feat: update miniflux

---
 miniflux/.env-example        |  2 ++
 miniflux/README.org          | 13 ---------
 miniflux/docker-compose.yaml | 54 +++++++++++++++++-------------------
 3 files changed, 27 insertions(+), 42 deletions(-)
 delete mode 100644 miniflux/README.org

diff --git a/miniflux/.env-example b/miniflux/.env-example
index 40950ec..0419a42 100644
--- a/miniflux/.env-example
+++ b/miniflux/.env-example
@@ -1,3 +1,5 @@
+TUNNEL_TOKEN=token
+
 DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
 POSTGRES_USER=miniflux
 POSTGRES_PASSWORD=secret
diff --git a/miniflux/README.org b/miniflux/README.org
deleted file mode 100644
index bfd7f59..0000000
--- a/miniflux/README.org
+++ /dev/null
@@ -1,13 +0,0 @@
-* miniflux
-
-Firstly create ~.env~ file from example and fill values:
-
-#+begin_src shell
-  $ cp .env-example .env
-#+end_src
-
-After that just run containers:
-
-#+begin_src shell
-  $ docker-compose up -d
-#+end_src
diff --git a/miniflux/docker-compose.yaml b/miniflux/docker-compose.yaml
index 3630bdd..84bb4ab 100644
--- a/miniflux/docker-compose.yaml
+++ b/miniflux/docker-compose.yaml
@@ -1,48 +1,44 @@
-version: '3.4'
+version: '3'
+
 services:
   miniflux:
     image: miniflux/miniflux:latest
-    restart: unless-stopped
-    #ports:
-    #  - "127.0.0.1:8080:8080"
-    dns:
-      - 8.8.8.8
-      - 9.9.9.9
+    restart: always
     depends_on:
-      - db
-    networks:
-      - back
-      - caddy-network
+      db:
+        condition: service_healthy
     environment:
       - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
-      - RUN_MIGRATIONS=1
-      - CREATE_ADMIN=1
-      - TZ=Europe/Moscow
+      - RUN_MIGRATIONS
+      - CREATE_ADMIN
       - ADMIN_USERNAME
       - ADMIN_PASSWORD
-      - POLLING_FREQUENCY
-      - POLLING_PARSING_ERROR_LIMIT
-      - BASE_URL
+      - POLLING_FREQUENCY=10
       - POCKET_CONSUMER_KEY
-      - PROXY_IMAGES
-        #- POLLING_SCHEDULER
+      - BASE_URL=https://reader.example.org
+      - TZ=Europe/Moscow
+
   db:
-    image: postgres:latest
-    restart: unless-stopped
+    image: postgres:15
+    restart: always
     environment:
       - POSTGRES_USER=miniflux
       - POSTGRES_PASSWORD=secret
-    networks:
-      - back
+      - POSTGRES_DB=miniflux
     volumes:
       - miniflux-db:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD", "pg_isready", "-U", "miniflux"]
       interval: 10s
       start_period: 30s
-volumes:
-  miniflux-db:
-networks:
-  back:
-  caddy-network:
-    external: true
\ No newline at end of file
+
+  cloudflared:
+    image: cloudflare/cloudflared:latest
+    environment:
+      - TUNNEL_TOKEN
+    command: 'tunnel run'
+    restart: always
+    read_only: true
+    user: root
+    depends_on:
+      - miniflux