Add nodifts, update all to use cloudflared

blog/docker-compose.yml

@@ -1,14 +1,15 @@
 version: "2.1"
 services:
   chyrplite:
-    image: ghcr.io/msws/docker-chyrp-lite:latest
+    # image: ghcr.io/msws/docker-chyrp-lite:latest
+    image: docker.io/library/chryp-lite:test
     container_name: chyrp-lite-default
     restart: always
     volumes:
       - data:/data
       - html:/var/www/html
     networks:
-      - monolith_default
+      - cloudflared
       - chyrp_internal
   database:
     image: mariadb
@@ -22,8 +23,8 @@ services:
       - dbdata:/var/lib/mysql
     networks:
       - chyrp_internal
-    ports:
-      - "3306:3306"
+    #    ports:
+    #      - "3306:3306"
 
 
 volumes:
@@ -31,6 +32,6 @@ volumes:
   html:
   dbdata:
 networks:
-  monolith_default:
+  cloudflared:
     external: true
   chyrp_internal:

cf-tunnel/docker-compose.yml

@@ -1,14 +1,21 @@
 version: '3' # Use a common Docker Compose file version
 
 services:
-  cloudflared:
+  cloudflared-public:
     image: cloudflare/cloudflared:latest
     restart: always  # Restart the container if it fails
     command: tunnel --no-autoupdate run  # Your main command 
     environment:
-      TUNNEL_TOKEN: "${TUNNEL_TOKEN}"
+      TUNNEL_TOKEN: "${PUBLIC_TUNNEL_TOKEN}"
     networks:
       - cloudflared
+  cloudflared-internal:
+    image: cloudflare/cloudflared:latest
+    restart: always  # Restart the container if it fails
+    command: tunnel --no-autoupdate run  # Your main command 
+    environment:
+      TUNNEL_TOKEN: "${PRIVATE_TUNNEL_TOKEN}"
+    network_mode: "host"
 
 networks:
   cloudflared:

code-server/Dockerfile

@@ -27,9 +27,9 @@ RUN git config --global user.name MSWS && \
 RUN git clone https://github.com/MSWS/nvim-config.git /config/.config/nvim
 
 # Set up SSH and permissions
-RUN mkdir -p /home/abc/.ssh/ && chmod 0700 /home/abc/.ssh/
+RUN mkdir -p /config/.ssh/ && chmod 0700 /config/.ssh/
 
-COPY --chown=abc:abc .ssh /home/abc/.ssh
+COPY --chown=abc:abc .ssh /config/.ssh
 COPY extensions /extensions
 
 # Install VSCode extensions

jellyfin/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     image: jellyfin/jellyfin
     container_name: jellyfin
     networks:
-      - monolith_default
+      - cloudflared
     volumes:
       - /home/iboaz/jellyfin/config:/config
       - /home/iboaz/jellyfin/cache:/cache
@@ -20,5 +20,5 @@ services:
       - 'host.docker.internal:host-gateway'
 
 networks:
-  monolith_default:
+  cloudflared:
     external: true

navidrome/docker-compose.yml

@@ -49,6 +49,22 @@ services:
         - cloudflared
         - tor
 
+  sonarr:
+    image: lscr.io/linuxserver/sonarr:latest
+    container_name: sonarr
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - "${PWD}/sonarr/data:/config"
+      - "/home/iboaz/jellyfin/media/shows:/shows"
+      - "${PWD}/downloads:/downloads"
+    restart: unless-stopped
+    networks:
+        - cloudflared
+        - tor
+
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent

nodifts/docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3.8'
+
+services:
+  nodifts-backend:
+    image: ghcr.io/msws/nodifts-backend:latest
+    container_name: nodifts-backend
+    restart: unless-stopped
+    environment:
+      - NODE_ENV=production
+      - SUBPATH=nodifts
+      - WEATHER_URL=${WEATHER_URL}
+      - WAKA_KEY=${WAKA_KEY}
+      - WAKA_URL=${WAKA_URL}
+    networks:
+      - cloudflared
+  nodifts-frontend:
+    image: ghcr.io/msws/nodifts-frontend:latest
+    container_name: nodifts-frontend
+    restart: unless-stopped
+    environment:
+      - NODE_ENV=production
+      - API_URL=${API_URL}
+      - REFRESH_RATE=50
+    networks:
+      - cloudflared
+
+networks:
+  cloudflared:
+    external: true

uptime/docker-compose.yml

@@ -4,15 +4,13 @@ services:
     image: louislam/uptime-kuma:1
     container_name: uptime-kuma
     restart: always
-    ports:
-      - "3001:3001"
     volumes:
       - uptime-kuma:/app/data
     networks:
-      - monolith_default
+      - cloudflared
 
 networks:
-  monolith_default:
+  cloudflared:
     external: true
 
 volumes:

wakapi/docker-compose.yml

@@ -2,20 +2,20 @@ version: '3.8'
 
 services:
   wakapi:
-    image: ghcr.io/muety/wakapi:latest
+    image: wakapi:test
     container_name: wakapi
     restart: always
-    ports:
-      - "3002:3002"
+#    ports:
+#      - "3002:3002"
     environment:
       WAKAPI_PASSWORD_SALT: "${WAKAPI_PASSWORD_SALT}"
       WAKAPI_PORT: "3002"
       WAKAPI_PUBLIC_URL: "https://waka.msws.xyz"
-      WAKAPI_DB_HOST: "nextclouddb"
+      WAKAPI_DB_HOST: "wakapi-database-1"
       WAKAPI_DB_PORT: "3306"
-      WAKAPI_DB_USER: "wakapi_user"
-      WAKAPI_DB_PASSWORD: "your-password"
-      WAKAPI_DB_NAME: "wakapi"
+      WAKAPI_DB_USER: "${MYSQL_USER}"
+      WAKAPI_DB_PASSWORD: "${MYSQL_PASSWORD}"
+      WAKAPI_DB_NAME: "${MYSQL_DATABASE}"
       WAKAPI_DB_TYPE: "mysql"
       WAKAPI_ALLOW_SIGNUP: "false"
       WAKAPI_DISABLE_FRONTPAGE: "true"
@@ -28,17 +28,30 @@ services:
       WAKAPI_MAIL_SMTP_USER: "${WAKAPI_MAIL_SMTP_USER}"
       WAKAPI_MAIL_SMTP_PASS: "${WAKAPI_MAIL_SMTP_PASS}"
       WAKAPI_MAIL_SENDER: "${WAKAPI_MAIL_SENDER}"
+      WAKAPI_IMPORT_MAX_RATE: 0
     volumes:
       - wakapi-data:/data
     networks:
-      - monolith_default
-      - nextcloud_maria_internal
+      - cloudflared
+      - mariadb
+  database:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - wakapi-db:/var/lib/mysql
+    networks:
+      - mariadb
 
 volumes:
   wakapi-data:
+  wakapi-db:
 
 networks:
-  monolith_default:
-    external: true
-  nextcloud_maria_internal:
+  cloudflared:
     external: true
+  mariadb: