15 changed files with 300 additions and 244 deletions
--- a/7daystodie.yml
+++ b/7daystodie.yml
@ -0,0 +1,13 @@
+---
+version: '3.4'
+
+services:
+  7daystodie:
+    image: 7daysserver:latest
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_STORAGE_PATH}/7daystodie/saves:/home/steam/.local/share/7DaysToDie/Saves
+      - ${DOCKER_STORAGE_PATH}/7daystodie/server:/home/steam/server
+    ports:
+      - 26900-26902:26900-26902/udp
+      - 18500:8080
--- a/audiobookshelf.yml
+++ b/audiobookshelf.yml
@ -0,0 +1,19 @@
+---
+    version: "2.1"
+    services:
+      audiobookshelf:
+        image:  ghcr.io/advplyr/audiobookshelf
+        container_name: audiobookshelf
+        environment:
+          - AUDIOBOOKSHELF_UID=${PUID}
+          - AUDIOBOOKSHELF_GID=${PGID}
+          - TZ=${TZ}
+        volumes:
+          - "${DOCKER_STORAGE_PATH}/audiobookshelf/audiobooks:/audiobooks"
+          - "${DOCKER_STORAGE_PATH}/audiobookshelf/podcasts:/podcasts"
+          - "${DOCKER_STORAGE_PATH}/audiobookshelf/config:/config"
+          - "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata"
+        ports:
+          - "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}"
+        restart: unless-stopped
+    
--- a/beets.yml
+++ b/beets.yml
@ -0,0 +1,17 @@
+---
+version: "2.1"
+services:
+  beets:
+    image: ${REGISTRY_URL}/beets:latest
+    container_name: beets
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/beets:/config"
+      - "${STORAGE_PATH}/media/music2:/music"
+      - "${STORAGE_PATH}/download/music:/downloads"
+    ports:
+      - 8337:8337
+    restart: unless-stopped
--- a/changedetection.yml
+++ b/changedetection.yml
@ -0,0 +1,29 @@
+---
+    version: "2.1"
+    services:
+      changedetection:
+        image: dgtlmoon/changedetection.io
+        container_name: changedetection
+        depends_on:
+          - browserless
+        user: ${PUID}:${PGID}
+        environment:
+          - TZ=${TZ}
+          - BASE_URL=changes.kucharczyk.xyz
+          - PLAYWRIGHT_DRIVER_URL="ws://browserless:3000/?stealth=1&--disable-web-security=true"
+        volumes:
+          - "${DOCKER_STORAGE_PATH}/changedetection/data:/datastore"
+        ports:
+          - "${CHANGEDETECTION_EXTERNAL_PORT}:${CHANGEDETECTION_INTERNAL_PORT}"
+        restart: unless-stopped
+      browserless:
+        image: browserless/chrome:1.53-chrome-stable
+        container_name: browserless
+        shm_size: '2g'
+        environment:
+          - "DEFAULT_LAUNCH_ARGS=[\"--window-size=1920,1080\"]"
+        ports:
+          - "3100:3000"
+        restart: unless-stopped
+
+    
--- a/deluge.yml
+++ b/deluge.yml
@ -0,0 +1,18 @@
+---
+version: "2.1"
+services:
+  deluge:
+    image: lscr.io/linuxserver/deluge:latest
+    container_name: deluge
+    environment:
+      - PUID=1000
+      - PGID=100
+      - TZ=Europe/Prague
+      - DELUGE_LOGLEVEL=error #optional
+    volumes:
+      - /docker/deluge2:/config
+      - /srv/mergerfs/storage/seed:/seed
+    ports:
+      - "8112:8112"
+      - "58846:58846"
+    restart: unless-stopped
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -104,249 +104,5 @@ services:
      - infra
    restart: unless-stopped

-  changedetection:
-    image: dgtlmoon/changedetection.io
-    container_name: changedetection
-    user: ${PUID}:${PGID}
-    environment:
-      - TZ=${TZ}
-      - BASE_URL=changes.kucharczyk.xyz
-      - PLAYWRIGHT_DRIVER_URL="ws://browserless:3000/?stealth=1&--disable-web-security=true"
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/changedetection/data:/datastore"
-    ports:
-      - "${CHANGEDETECTION_EXTERNAL_PORT}:${CHANGEDETECTION_INTERNAL_PORT}"
-    depends_on:
-      - browserless
-    profiles:
-      - base
-    restart: unless-stopped
-
-  browserless:
-    image: browserless/chrome:1.53-chrome-stable
-    container_name: browserless
-    shm_size: '2g'
-    environment:
-      - "DEFAULT_LAUNCH_ARGS=[\"--window-size=1920,1080\"]"
-    ports:
-      - "3100:3000"
-    profiles:
-      - base
-    restart: unless-stopped
-
-  audiobookshelf:
-    image: ghcr.io/advplyr/audiobookshelf
-    container_name: audiobookshelf
-    environment:
-      - AUDIOBOOKSHELF_UID=${PUID}
-      - AUDIOBOOKSHELF_GID=${PGID}
-      - TZ=${TZ}
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/audiobookshelf/audiobooks:/audiobooks"
-      - "${DOCKER_STORAGE_PATH}/audiobookshelf/podcasts:/podcasts"
-      - "${DOCKER_STORAGE_PATH}/audiobookshelf/config:/config"
-      - "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata"
-    ports:
-      - "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}"
-    profiles:
-      - disabled
-    restart: unless-stopped
-
-  beets:
-    image: ${REGISTRY_URL}/beets:latest
-    container_name: beets
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/beets:/config"
-      - "${STORAGE_PATH}/media/music2:/music"
-      - "${STORAGE_PATH}/download/music:/downloads"
-    ports:
-      - 8337:8337
-    profiles:
-      - base
-    restart: unless-stopped
-
-  deluge:
-    image: lscr.io/linuxserver/deluge:latest
-    container_name: deluge
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-      - DELUGE_LOGLEVEL=error #optional
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/deluge2:/config"
-      - "${STORAGE_PATH}/seed:/seed"
-    ports:
-      - "8112:8112"
-      - "58846:58846"
-    profiles:
-      - disabled
-    restart: unless-stopped
-
-  filebrowser:
-    image: filebrowser/filebrowser:s6
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/filebrowser/filebrowser.db:/database/file-browser.db"
-      - "${DOCKER_STORAGE_PATH}/filebrowser/settings.json:/config/fb-settings.json"
-      - "${STORAGE_PATH}:/srv"
-    ports:
-      - "9999:80"
-    profiles:
-      - base
-    restart: unless-stopped
-
-  mealie:
-    container_name: mealie
-    image: hkotel/mealie:latest
-    ports:
-      - ${MEALIE_EXTERNAL_PORT}:${MEALIE_INTERNAL_PORT}
-    environment:
-      PUID: ${PUID}
-      PGID: ${PGID}
-      TZ: ${TZ}
-    env_file:
-      - mealie.env
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/mealie/data/:/app/data"
-    restart: unless-stopped
-
-  rtorrent:
-    image: binhex/arch-rtorrentvpn
-    container_name: rtorrent
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/rtorrent/config:/config"
-      - ${STORAGE_PATH}/seed:/data
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-    env_file:
-      - rtorrent.env
-    ports:
-      - "9080:9080"
-      - "9443:9443"
-      - "8118:8118"
-      - "6881:6881"
-    profiles:
-      - base
-    restart: unless-stopped
-
-  kavita:
-    image: "kizaing/kavita:latest"
-    container_name: kavita
-    env_file:
-      - kavita.env
-    ports:
-      - "${KAVITA_EXTERNAL_PORT}:${KAVITA_INTERNAL_PORT}"
-    volumes:
-      - "${STORAGE_PATH}/media/comics:/manga"
-      - "${DOCKER_STORAGE_PATH}/kavita:/kavita/config"
-    profiles:
-      - base
-    restart: unless-stopped
-
-  webhook:
-    image: ${REGISTRY_URL}/webhook
-    container_name: webhook
-    build: https://git.kucharczyk.xyz/containers/webhook.git#main
-    user: ${PUID}:${PGID}
-    environment:
-      - TZ=${TZ}
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/webhook/config:/config"
-      - "${DOCKER_STORAGE_PATH}/webhook/scripts:/var/webhook"
-    ports:
-      - "${WEBHOOK_EXTERNAL_PORT}:${WEBHOOK_INTERNAL_PORT}"
-    profiles:
-      - base
-      - infra
-    restart: unless-stopped
-
-  valheim:
-    image: ghcr.io/lloesche/valheim-server
-    container_name: valheim
-    volumes:
-      - ${DOCKER_STORAGE_PATH}/valheim/config:/config
-      - ${DOCKER_STORAGE_PATH}/valheim/data:/opt/valheim
-    env_file:
-      - valheim.env
-    ports:
-      - ${VALHEIM_EXTERNAL_PORT}:${VALHEIM_INTERNAL_PORT}
-    cap_add:
-      - SYS_NICE
-    profiles:
-      - disabled
-    restart: unless-stopped
-
-  7daystodie:
-    image: 7daysserver:latest
-    container_name: 7dtd
-    volumes:
-      - ${DOCKER_STORAGE_PATH}/7daystodie/saves:/home/steam/.local/share/7DaysToDie/Saves
-      - ${DOCKER_STORAGE_PATH}/7daystodie/server:/home/steam/server
-    ports:
-      - 26900-26902:26900-26902/udp
-      - 18500:8080
-    profiles:
-      - disabled
-    restart: unless-stopped
-
-  snibox_frontend:
-    image: snibox/nginx-puma:1.15.9
-    ports:
-      - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}"
-    volumes:
-      - snibox-static:/var/www/html
-    networks:
-      - default
-    depends_on:
-      - snibox_backend
-
-  snibox_backend:
-    image: snibox/snibox:latest
-    command: sh -c "rm -rf tmp/pids && ./bin/rails s -p 3000 -b '0.0.0.0'"
-    env_file:
-      - snibox.env
-    environment:
-      DB_NAME: "${SNIBOX_POSTGRES_DB_NAME}"
-      DB_USER: "${POSTGRES_USERNAME}"
-      DB_PASS: "${POSTGRES_PASSWORD}"
-      DB_HOST: "${POSTGRES_HOST}"
-      DB_PORT: "${POSTGRES_PORT}"
-      # MAILGUN_SMTP_PORT: "${MAILGUN_SMTP_PORT}"
-      # MAILGUN_SMTP_SERVER: "${MAILGUN_SMTP_SERVER}"
-      # MAILGUN_SMTP_LOGIN: "${MAILGUN_SMTP_LOGIN}"
-      # MAILGUN_SMTP_PASSWORD: "${MAILGUN_SMTP_PASSWORD}"
-      # MAILGUN_API_KEY: "${MAILGUN_API_KEY}"
-      # MAILGUN_DOMAIN: "${MAILGUN_DOMAIN}"
-      # MAILGUN_PUBLIC_KEY: "${MAILGUN_PUBLIC_KEY}"
-      # ports:
-      #   - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}"
-    volumes:
-      - snibox-static:/app/public
-    networks:
-      - default
-      - postgres
-    # depends_on:
-    #   - database
-
-    # database:
-    #   image: postgres:10.7-alpine
-    #   volumes:
-    #     - pg-data:/var/lib/postgresql/data
-
-networks:
-  default:
-  postgres:
-    external: true
-
 volumes:
  timetracker-static:
-  snibox-static:
--- a/file-browser.yml
+++ b/file-browser.yml
@ -0,0 +1,23 @@
+---
+version: "3.4"
+services:
+  server:
+      image: filebrowser/filebrowser:s6
+      restart: unless-stopped
+      environment:
+        PUID: 1000
+        PGID: 100
+      volumes:
+        - ${DOCKER_STORAGE_PATH}/filebrowser/filebrowser.db:/database/file-browser.db
+        - ${DOCKER_STORAGE_PATH}/filebrowser/settings.json:/config/fb-settings.json
+        - /srv/mergerfs/storage:/srv
+      env_file:
+        - .env
+      ports:
+        - "9999:80"
+      networks:
+        - internal
+
+networks:
+  internal:
+    external: true 
--- a/kavita.yml
+++ b/kavita.yml
@ -0,0 +1,18 @@
+--- 
+networks: 
+  internal: 
+    external: true
+services: 
+  kavita: 
+    env_file: 
+      - kavita.env
+    image: "kizaing/kavita:latest"
+    networks: 
+      - internal
+    ports: 
+      - "${KAVITA_EXTERNAL_PORT}:${KAVITA_INTERNAL_PORT}"
+    restart: unless-stopped
+    volumes: 
+      - "${STORAGE_PATH}/media/comics:/manga"
+      - "${DOCKER_STORAGE_PATH}/kavita:/kavita/config"
+version: "3.4"
--- a/mealie.yml
+++ b/mealie.yml
@ -0,0 +1,16 @@
+version: "3.1"
+services:
+  mealie:
+    container_name: mealie
+    image: hkotel/mealie:latest
+    restart: unless-stopped
+    ports:
+      - ${MEALIE_EXTERNAL_PORT}:${MEALIE_INTERNAL_PORT}
+    environment:
+      PUID: ${PUID}
+      PGID: ${PGID}
+      TZ: ${TZ}
+    env_file:
+      - mealie.env
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/mealie/data/:/app/data"
--- a/ntfy.yml
+++ b/ntfy.yml
@ -0,0 +1,20 @@
+---
+version: "2.1"
+services:
+  ntfy:
+    image: binwiederhier/ntfy
+    container_name: ntfy
+    command:
+      - serve
+    user: ${PUID}:${PGID}
+    environment:
+      - TZ=${TZ}
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/ntfy/cache:/var/cache/ntfy"
+      - "${DOCKER_STORAGE_PATH}/ntfy/config:/etc/ntfy"
+    ports:
+      - "${NTFY_EXTERNAL_PORT}:${NTFY_INTERNAL_PORT}"
+    profiles:
+      - base
+      - infra
+    restart: unless-stopped
--- a/rtorrent.yml
+++ b/rtorrent.yml
@ -0,0 +1,22 @@
+---
+version: "3.1"
+services:
+  rtorrent:
+    image: binhex/arch-rtorrentvpn
+    container_name: rtorrent
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/rtorrent/config:/config"
+      - ${STORAGE_PATH}/seed:/data
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+    env_file:
+      - rtorrent.env
+    ports:
+      - "9080:9080"
+      - "9443:9443"
+      - "8118:8118"
+      - "6881:6881"
+    restart: unless-stopped
+
--- a/snibox.yml
+++ b/snibox.yml
@ -0,0 +1,55 @@
+version: '3'
+
+services:
+  frontend:
+    image: snibox/nginx-puma:1.15.9
+    ports:
+      - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}"
+    volumes:
+      - static-files:/var/www/html
+    networks:
+      - default
+    depends_on:
+      - backend
+
+  backend:
+    image: snibox/snibox:latest
+    command: sh -c "rm -rf tmp/pids && ./bin/rails s -p 3000 -b '0.0.0.0'"
+    env_file:
+      - snibox.env
+    environment:
+      DB_NAME: "${SNIBOX_POSTGRES_DB_NAME}"
+      DB_USER: "${POSTGRES_USERNAME}"
+      DB_PASS: "${POSTGRES_PASSWORD}"
+      DB_HOST: "${POSTGRES_HOST}"
+      DB_PORT: "${POSTGRES_PORT}"
+      # MAILGUN_SMTP_PORT: "${MAILGUN_SMTP_PORT}"
+      # MAILGUN_SMTP_SERVER: "${MAILGUN_SMTP_SERVER}"
+      # MAILGUN_SMTP_LOGIN: "${MAILGUN_SMTP_LOGIN}"
+      # MAILGUN_SMTP_PASSWORD: "${MAILGUN_SMTP_PASSWORD}"
+      # MAILGUN_API_KEY: "${MAILGUN_API_KEY}"
+      # MAILGUN_DOMAIN: "${MAILGUN_DOMAIN}"
+      # MAILGUN_PUBLIC_KEY: "${MAILGUN_PUBLIC_KEY}"
+      # ports:
+      #   - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}"
+    volumes:
+      - static-files:/app/public
+    networks:
+      - default
+      - postgres
+    # depends_on:
+    #   - database
+
+    # database:
+    #   image: postgres:10.7-alpine
+    #   volumes:
+    #     - pg-data:/var/lib/postgresql/data
+
+networks:
+  default:
+  postgres:
+    external: true
+
+volumes:
+  # pg-data:
+  static-files:
--- a/timetracker.yml
+++ b/timetracker.yml
@ -0,0 +1,16 @@
+---
+    version: "2.1"
+    services:
+      timetracker:
+        image:  ${REGISTRY_URL}/timetracker
+        container_name: timetracker
+        environment:
+          - TZ=${TZ}
+          - "CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz"
+        user: ${PUID}
+        volumes:
+          - "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3:/home/timetracker/app/src/web/db.sqlite3"
+        ports:
+          - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}"
+        restart: unless-stopped
+    
--- a/valheim.yml
+++ b/valheim.yml
@ -0,0 +1,17 @@
+---
+version: '3.4'
+
+services:
+  valheim:
+    image: ghcr.io/lloesche/valheim-server
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_STORAGE_PATH}/valheim/config:/config
+      - ${DOCKER_STORAGE_PATH}/valheim/data:/opt/valheim
+    env_file:
+      - shared.env
+      - valheim.env
+    ports:
+      - ${VALHEIM_EXTERNAL_PORT}:${VALHEIM_INTERNAL_PORT}
+    cap_add:
+      - SYS_NICE
--- a/webhook.yml
+++ b/webhook.yml
@ -0,0 +1,17 @@
+---
+    version: "2.1"
+    services:
+      webhook:
+        image: ${REGISTRY_URL}/webhook
+        container_name: webhook
+        build: https://git.kucharczyk.xyz/containers/webhook.git#main
+        user: ${PUID}:${PGID}
+        environment:
+          - TZ=${TZ}
+        volumes:
+          - "${DOCKER_STORAGE_PATH}/webhook/config:/config"
+          - "${DOCKER_STORAGE_PATH}/webhook/scripts:/var/webhook"
+        ports:
+          - "${WEBHOOK_EXTERNAL_PORT}:${WEBHOOK_INTERNAL_PORT}"
+        restart: unless-stopped
+