From 4692f764e8843582ed6e0e4b7cd9087484d22a5b Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 5 Jul 2020 12:02:51 +0300
Subject: [PATCH] Switch to freshrss

---
 .gitmodules                        |  3 --
 docker/freshrss/docker-compose.yml | 14 ++++++
 docker/newsblur/.env               |  8 ----
 docker/newsblur/docker-compose.yml | 75 ------------------------------
 4 files changed, 14 insertions(+), 86 deletions(-)
 create mode 100644 docker/freshrss/docker-compose.yml
 delete mode 100644 docker/newsblur/.env
 delete mode 100644 docker/newsblur/docker-compose.yml

diff --git a/.gitmodules b/.gitmodules
index 9aee77b..674e4c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "dotdrop"]
 	path = dotdrop
 	url = https://github.com/deadc0de6/dotdrop.git
-[submodule "docker/newsblur/NewsBlur"]
-	path = docker/newsblur/NewsBlur
-	url = https://github.com/samuelclay/NewsBlur.git
diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml
new file mode 100644
index 0000000..e6a4ef8
--- /dev/null
+++ b/docker/freshrss/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "2.1"
+services:
+  freshrss:
+    image: linuxserver/freshrss
+    container_name: freshrss
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Helsinki
+    volumes:
+      - "/docker/freshrss:/config"
+    ports:
+      - 8088:80
+    restart: unless-stopped
diff --git a/docker/newsblur/.env b/docker/newsblur/.env
deleted file mode 100644
index 7d5414f..0000000
--- a/docker/newsblur/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-BUILD_TAG=latest
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-OWNER_UID=1000
-OWNER_GID=985
-HTTP_HOST=localhost
-SELF_URL_PATH=https://rss.reekynet.com
-HTTP_PORT=8280
diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml
deleted file mode 100644
index dc74a93..0000000
--- a/docker/newsblur/docker-compose.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-version: "2"
-services:
-  newsblur:
-    container_name: newsblur
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
-    image: newsblur
-    links:
-      - mongo-nb
-      - postgres-nb
-      - elasticsearch-nb
-      - redis-nb
-    ports:
-      - "8000:8000"
-    networks:
-      - proxy
-      - newsblur
-
-  postgres-nb:
-    container_name: postgres-nb
-    image: postgres:9
-    environment:
-      - POSTGRES_USER=newsblur
-      - POSTGRES_PASSWORD=newsblur
-    ports:
-      - "5432:5432"
-    volumes:
-      - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d"
-      - "/docker/newsblur/postgres/data:/var/lib/postgresql/data"
-    networks:
-      - newsblur
-
-  redis-nb:
-    container_name: redis-nb
-    image: redis:3
-    ports:
-      - "6379:6379"
-    volumes:
-      - "/docker/newsblur/redis/data:/data"
-      - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf"
-      - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf"
-      - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis"
-    command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf
-    networks:
-      - newsblur
-
-  elasticsearch-nb:
-    container_name: elasticsearch-nb
-    image: elasticsearch:1.7
-    ports:
-      - "9200:9200"
-    volumes:
-      - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data"
-    networks:
-      - newsblur
-
-  mongo-nb:
-    image: mongo:3.2
-    ports:
-      - "27017:27017"
-    command: mongod --smallfiles
-    volumes:
-      - "/docker/newsblur/mongo:/data/db"
-    networks:
-      - newsblur
-
-networks:
-  proxy:
-    external: true
-  newsblur:
-    driver: bridge
-    ipam:
-      driver: default
-    internal: true