moved piped compose to main compose

2023-11-06 16:23:27 -06:00
parent 342f41544d
commit 6bd856faaa
3 changed files with 55 additions and 78 deletions
@@ -235,6 +235,61 @@ services:
      - ${DOCKER_CONFIGS}/pihole/unbound:/etc/pihole:rw
      - ${DOCKER_CONFIGS}/pihole/dnsmasq-unbound:/etc/dnsmasq.d:rw

+    piped:
+        container_name: piped-backend
+        image: 1337kavin/piped:latest
+        depends_on:
+            - piped-postgres
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/config/config.properties:/app/config.properties:ro
+
+    piped-frontend:
+        container_name: piped-frontend
+        image: 1337kavin/piped-frontend:latest
+        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/pipedapi.akanealw.com/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
+        depends_on:
+            - piped
+        restart: always
+
+    piped-nginx:
+        container_name: piped-nginx
+        image: nginx:mainline-alpine
+        depends_on:
+            - piped
+            - piped-proxy
+            - piped-frontend
+        ports:
+            - "8585:80"
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/config/nginx.conf:/etc/nginx/nginx.conf:ro
+            - ${DOCKER_CONFIGS}/piped/config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
+            - ${DOCKER_CONFIGS}/piped/config/pipedproxy.conf:/etc/nginx/conf.d/pipedproxy.conf:ro
+            - ${DOCKER_CONFIGS}/piped/config/pipedfrontend.conf:/etc/nginx/conf.d/pipedfrontend.conf:ro
+            - ${DOCKER_CONFIGS}/piped/config/ytproxy.conf:/etc/nginx/snippets/ytproxy.conf:ro
+            - ${DOCKER_CONFIGS}/piped/piped-proxy:/var/run/ytproxy
+
+    piped-postgres:
+        container_name: piped-postgres
+        image: postgres:15
+        environment:
+            - POSTGRES_DB=piped
+            - POSTGRES_USER=piped
+            - POSTGRES_PASSWORD=Vee0caiv8ieceeDae1aepheirophai
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/data/db:/var/lib/postgresql/data
+
+    piped-proxy:
+        container_name: piped-proxy
+        image: 1337kavin/piped-proxy:latest
+        environment:
+            - UDS=1
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/piped-proxy:/app/socket
+
  shlink-server:
    container_name: shlink-server
    image: shlinkio/shlink:stable
@@ -1,18 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-SERVERIP=192.168.1.33
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=8ung1e1!
-BACKUP_DIR=/mnt/truenas-backups
-MEDIA_DIR=/mnt/truenas-media
-STORAGE_DIR=/mnt/truenas-storage
@@ -1,60 +0,0 @@
-version: '3'
-
-services:
-    piped-frontend:
-        container_name: piped-frontend
-        image: 1337kavin/piped-frontend:latest
-        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/pipedapi.akanealw.com/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
-        depends_on:
-            - piped
-        restart: always
-
-    piped-proxy:
-        container_name: piped-proxy
-        image: 1337kavin/piped-proxy:latest
-        environment:
-            - UDS=1
-        restart: always
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/piped-proxy:/app/socket
-
-    piped:
-        container_name: piped-backend
-        image: 1337kavin/piped:latest
-        depends_on:
-            - piped-postgres
-        restart: always
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/config/config.properties:/app/config.properties:ro
-
-    piped-nginx:
-        container_name: piped-nginx
-        image: nginx:mainline-alpine
-        depends_on:
-            - piped
-            - piped-proxy
-            - piped-frontend
-        ports:
-            - "8585:80"
-        restart: always
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/config/nginx.conf:/etc/nginx/nginx.conf:ro
-            - ${DOCKER_CONFIGS}/piped/config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
-            - ${DOCKER_CONFIGS}/piped/config/pipedproxy.conf:/etc/nginx/conf.d/pipedproxy.conf:ro
-            - ${DOCKER_CONFIGS}/piped/config/pipedfrontend.conf:/etc/nginx/conf.d/pipedfrontend.conf:ro
-            - ${DOCKER_CONFIGS}/piped/config/ytproxy.conf:/etc/nginx/snippets/ytproxy.conf:ro
-            - ${DOCKER_CONFIGS}/piped/piped-proxy:/var/run/ytproxy
-
-    piped-postgres:
-        container_name: piped-postgres
-        image: postgres:15
-        environment:
-            - POSTGRES_DB=piped
-            - POSTGRES_USER=piped
-            - POSTGRES_PASSWORD=Vee0caiv8ieceeDae1aepheirophai
-        restart: always
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/data/db:/var/lib/postgresql/data
-
-networks:
-    piped: