From 9b65ff59fe6b738e4d6ccb22445e2e84371e884a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:21:34 +0300 Subject: [PATCH 1/7] Switch to newsblur --- .gitmodules | 3 + docker/{tt-rss => newsblur}/.env | 0 docker/newsblur/NewsBlur | 1 + docker/newsblur/docker-compose.yml | 75 +++++++++++++++++++++++++ docker/tt-rss/docker-compose.yml | 90 ------------------------------ 5 files changed, 79 insertions(+), 90 deletions(-) rename docker/{tt-rss => newsblur}/.env (100%) create mode 160000 docker/newsblur/NewsBlur create mode 100644 docker/newsblur/docker-compose.yml delete mode 100644 docker/tt-rss/docker-compose.yml diff --git a/.gitmodules b/.gitmodules index 674e4c5..9aee77b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [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/tt-rss/.env b/docker/newsblur/.env similarity index 100% rename from docker/tt-rss/.env rename to docker/newsblur/.env diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur new file mode 160000 index 0000000..d0f15ab --- /dev/null +++ b/docker/newsblur/NewsBlur @@ -0,0 +1 @@ +Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml new file mode 100644 index 0000000..dc74a93 --- /dev/null +++ b/docker/newsblur/docker-compose.yml @@ -0,0 +1,75 @@ +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 diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml deleted file mode 100644 index c4e7bb4..0000000 --- a/docker/tt-rss/docker-compose.yml +++ /dev/null @@ -1,90 +0,0 @@ -version: "3" - -services: - db: - container_name: tt-rss-db - image: postgres:12-alpine - restart: unless-stopped - volumes: - - /docker/tt-rss/db:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - POSTGRES_USER=${POSTGRES_USER} - networks: - - tt-rss - - app: - container_name: tt-rss-app - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - db - networks: - - tt-rss - - updater: - container_name: tt-rss-updater - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - app - command: /updater.sh - networks: - - tt-rss - - web: - container_name: tt-rss-web - image: cthulhoo/ttrss-web - restart: unless-stopped - ports: - - ${HTTP_PORT}:2015 - volumes: - - /docker/tt-rss/app:/var/www/html:ro - depends_on: - - app - networks: - - tt-rss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.tt-rss-redirect.entrypoints=http" - - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.tt-rss-redirect.middlewares=http2https" - - - "traefik.http.routers.tt-rss.entrypoints=https" - - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)" - - "traefik.http.routers.tt-rss.tls=true" - - "traefik.http.routers.tt-rss.tls.certresolver=http" - - "traefik.http.routers.tt-rss.service=tt-rss" - - "traefik.docker.network=proxy" - - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" - -networks: - tt-rss: - external: false - proxy: - external: true From 5cb1a0805220eade8f53dffb2791277ce53b1788 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:23:53 +0300 Subject: [PATCH 2/7] Remove unneeded directory --- docker/newsblur/NewsBlur | 1 - 1 file changed, 1 deletion(-) delete mode 160000 docker/newsblur/NewsBlur diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur deleted file mode 160000 index d0f15ab..0000000 --- a/docker/newsblur/NewsBlur +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 From 4692f764e8843582ed6e0e4b7cd9087484d22a5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:02:51 +0300 Subject: [PATCH 3/7] 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 From 51063de92f38f58e70370ed274e120e6653975bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:13:51 +0300 Subject: [PATCH 4/7] Add network stuff and db --- docker/freshrss/docker-compose.yml | 44 ++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index e6a4ef8..b0c365c 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -3,12 +3,50 @@ services: freshrss: image: linuxserver/freshrss container_name: freshrss + restart: unless-stopped + networks: + - freshrss + - proxy + ports: + - 8088:80 environment: - PUID=1000 - PGID=1000 - TZ=Europe/Helsinki volumes: - - "/docker/freshrss:/config" - ports: - - 8088:80 + - /docker/freshrss/freshrss:/config + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.freshrss-redirect.entrypoints=http" + - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.freshrss-redirect.middlewares=http2https" + + - "traefik.http.routers.freshrss.entrypoints=https" + - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss.tls=true" + - "traefik.http.routers.freshrss.tls.certresolver=http" + - "traefik.http.routers.freshrss.service=freshrss" + - "traefik.docker.network=proxy" + - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + + mariadb-freshrss: + container_name: mariadb-freshrss + image: mariadb restart: unless-stopped + networks: + - freshrss + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=gitea + volumes: + - /docker/freshrss/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + +networks: + freshrss: + external: false + proxy: + external: true From 48dbfa66c9463868e0da64939d40c7ff9443abf6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:14:15 +0300 Subject: [PATCH 5/7] Change db password --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index b0c365c..3f717f4 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -40,7 +40,7 @@ services: - freshrss environment: - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=gitea + - MYSQL_ROOT_PASSWORD=freshrss volumes: - /docker/freshrss/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro From 027c4766a628518d6bebd938371836596b0b66d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:15:18 +0300 Subject: [PATCH 6/7] Change port --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 3f717f4..4ae62a1 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -30,7 +30,7 @@ services: - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" - "traefik.docker.network=proxy" - - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + - "traefik.http.services.freshrss.loadbalancer.server.port=80" mariadb-freshrss: container_name: mariadb-freshrss From c6d6be56d6c5210f7fab7457932789cf3172ad0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:17:03 +0300 Subject: [PATCH 7/7] Update GID --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 4ae62a1..9c071d2 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -11,7 +11,7 @@ services: - 8088:80 environment: - PUID=1000 - - PGID=1000 + - PGID=985 - TZ=Europe/Helsinki volumes: - /docker/freshrss/freshrss:/config