From 304822ae4269ea7fccd8794e4ede2da396c80d3d Mon Sep 17 00:00:00 2001
From: akanealw <akanealw@gmail.com>
Date: Sun, 23 Jul 2023 11:08:27 -0500
Subject: [PATCH] added separate folders for nitter and rss-proxy

---
 docker-compose.yml                   | 77 ----------------------------
 nitter/docker-compose.yml            | 54 +++++++++++++++++++
 nitter.conf => nitter/nitter.conf    |  0
 chrome.json => rss-proxy/chrome.json |  0
 rss-proxy/docker-compose.yml         | 32 ++++++++++++
 5 files changed, 86 insertions(+), 77 deletions(-)
 create mode 100644 nitter/docker-compose.yml
 rename nitter.conf => nitter/nitter.conf (100%)
 rename chrome.json => rss-proxy/chrome.json (100%)
 create mode 100644 rss-proxy/docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 29d185a..1a8c624 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,80 +1,3 @@
 version: '3'
 
 services:
-  nitter:
-    image: zedeus/nitter:latest
-    container_name: nitter
-    ports:
-      - "127.0.0.1:8280:8080" # Replace with "8080:8080" if you don't use a reverse proxy
-    volumes:
-      - ${DOCKERCONFIGS}/nitter/nitter.conf:/src/nitter.conf:Z,ro
-    depends_on:
-      - nitter-redis
-    restart: unless-stopped
-    healthcheck:
-      test: wget -nv --tries=1 --spider http://127.0.0.1:8280/Jack/status/20 || exit 1
-      interval: 30s
-      timeout: 5s
-      retries: 2
-    user: "998:998"
-    read_only: true
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
-    networks:
-      - nitter
-
-  nitter-redis:
-    image: redis:6-alpine
-    container_name: nitter-redis
-    command: redis-server --save 60 1 --loglevel warning
-    volumes:
-      - nitter-redis:/data
-    restart: unless-stopped
-    healthcheck:
-      test: redis-cli ping
-      interval: 30s
-      timeout: 5s
-      retries: 2
-    user: "999:1000"
-    read_only: true
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
-    networks:
-      - nitter
-
-  rich-puppeteer:
-    image: damoeb/rich-rss:puppeteer-0.1
-    restart: always
-    security_opt:
-      - seccomp=chrome.json
-    networks:
-      - puppeteer
-
-  rss-proxy:
-    image: damoeb/rss-proxy:2.0.0-beta
-    restart: always
-    depends_on:
-      - rich-puppeteer
-    ports:
-      - "8080:8080"
-    environment:
-      - LOG_LEVEL=info
-      # -- CHANGE THIS --
-      - APP_PUBLIC_URL=http://localhost:8080
-      - TOKEN_SECRET=1234_top_secret
-      - PUPPETEER_HOST=http://rich-puppeteer:3000
-    networks:
-      - puppeteer
-
-volumes:
-  nitter-redis:
-
-networks:
-  puppeteer:
-    driver: bridge
-  nitter:
-    driver: bridge
\ No newline at end of file
diff --git a/nitter/docker-compose.yml b/nitter/docker-compose.yml
new file mode 100644
index 0000000..2716db6
--- /dev/null
+++ b/nitter/docker-compose.yml
@@ -0,0 +1,54 @@
+version: '3'
+
+services:
+  nitter:
+    image: zedeus/nitter:latest
+    container_name: nitter
+    ports:
+      - "127.0.0.1:8280:8080" # Replace with "8080:8080" if you don't use a reverse proxy
+    volumes:
+      - ./nitter.conf:/src/nitter.conf:Z,ro
+    depends_on:
+      - nitter-redis
+    restart: unless-stopped
+    healthcheck:
+      test: wget -nv --tries=1 --spider http://127.0.0.1:8280/Jack/status/20 || exit 1
+      interval: 30s
+      timeout: 5s
+      retries: 2
+    user: "998:998"
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    networks:
+      - nitter
+
+  nitter-redis:
+    image: redis:6-alpine
+    container_name: nitter-redis
+    command: redis-server --save 60 1 --loglevel warning
+    volumes:
+      - nitter-redis:/data
+    restart: unless-stopped
+    healthcheck:
+      test: redis-cli ping
+      interval: 30s
+      timeout: 5s
+      retries: 2
+    user: "999:1000"
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    networks:
+      - nitter
+
+volumes:
+  nitter-redis:
+
+networks:
+  nitter:
+    driver: bridge
\ No newline at end of file
diff --git a/nitter.conf b/nitter/nitter.conf
similarity index 100%
rename from nitter.conf
rename to nitter/nitter.conf
diff --git a/chrome.json b/rss-proxy/chrome.json
similarity index 100%
rename from chrome.json
rename to rss-proxy/chrome.json
diff --git a/rss-proxy/docker-compose.yml b/rss-proxy/docker-compose.yml
new file mode 100644
index 0000000..22ef279
--- /dev/null
+++ b/rss-proxy/docker-compose.yml
@@ -0,0 +1,32 @@
+version: '3'
+
+services:
+  rich-puppeteer:
+    container_name: rich-puppeteer
+    image: damoeb/rich-rss:puppeteer-0.1
+    restart: always
+    security_opt:
+      - seccomp=chrome.json
+    networks:
+      - puppeteer
+
+  rss-proxy:
+    container_name: rss-proxy
+    image: damoeb/rss-proxy:2.0.0-beta
+    restart: always
+    depends_on:
+      - rich-puppeteer
+    ports:
+      - "8080:8080"
+    environment:
+      - LOG_LEVEL=info
+      # -- CHANGE THIS --
+      - APP_PUBLIC_URL=http://localhost:8080
+      - TOKEN_SECRET=1234_top_secret
+      - PUPPETEER_HOST=http://rich-puppeteer:3000
+    networks:
+      - puppeteer
+
+networks:
+  puppeteer:
+    driver: bridge