diff --git a/docker-compose.yml b/docker-compose.yml index 80e3674..7b8918d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,8 @@ services: - "/var/run/docker.sock:/var/run/docker.sock" ports: - "${UPTIME_KUMA_EXTERNAL_PORT}:${UPTIME_KUMA_INTERNAL_PORT}" + networks: + - public profiles: - infra - base @@ -19,6 +21,8 @@ services: container_name: logseq ports: - "${LOGSEQ_EXTERNAL_PORT}:${LOGSEQ_INTERNAL_PORT}" + networks: + - public profiles: - base @@ -28,6 +32,7 @@ services: ports: - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}" - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}" + - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}" user: ${PUID} volumes: - "${DOCKER_STORAGE_PATH}/caddy/data:/data" @@ -36,6 +41,10 @@ services: # - "${DOCKER_STORAGE_PATH}/caddy/srv:/srv" - "/www/notes:/srv/notes" - "timetracker-static:/srv/timetracker" + - "snibox-static:/srv/snibox" + networks: + - public + - caddy profiles: - infra - base @@ -53,6 +62,8 @@ services: - "timetracker-static:/home/timetracker/app/static" depends_on: - caddy + networks: + - caddy profiles: - base restart: unless-stopped @@ -70,6 +81,8 @@ services: - "${DOKKU_EXTERNAL_PORT_1}:${DOKKU_INTERNAL_PORT_1}" - "${DOKKU_EXTERNAL_PORT_2}:${DOKKU_INTERNAL_PORT_2}" - "${DOKKU_EXTERNAL_PORT_3}:${DOKKU_INTERNAL_PORT_3}" + networks: + - public profiles: - disabled @@ -79,10 +92,12 @@ services: restart: always environment: - TRILIUM_DATA_DIR=/home/node/trilium-data - ports: - - "${TRILIUM_EXTERNAL_PORT}:${TRILIUM_INTERNAL_PORT}" volumes: - ${DOCKER_STORAGE_PATH}/trilium:/home/node/trilium-data + ports: + - "${TRILIUM_EXTERNAL_PORT}:${TRILIUM_INTERNAL_PORT}" + networks: + - public profiles: - base @@ -99,6 +114,8 @@ services: - "${DOCKER_STORAGE_PATH}/ntfy/config:/etc/ntfy" ports: - "${NTFY_EXTERNAL_PORT}:${NTFY_INTERNAL_PORT}" + networks: + - public profiles: - base - infra @@ -118,6 +135,8 @@ services: - "${CHANGEDETECTION_EXTERNAL_PORT}:${CHANGEDETECTION_INTERNAL_PORT}" depends_on: - browserless + networks: + - public profiles: - base restart: unless-stopped @@ -130,6 +149,8 @@ services: - "DEFAULT_LAUNCH_ARGS=[\"--window-size=1920,1080\"]" ports: - "3100:3000" + networks: + - public profiles: - base restart: unless-stopped @@ -148,6 +169,8 @@ services: - "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata" ports: - "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}" + networks: + - public profiles: - disabled restart: unless-stopped @@ -165,6 +188,8 @@ services: - "${STORAGE_PATH}/download/music:/downloads" ports: - 8337:8337 + networks: + - public profiles: - base restart: unless-stopped @@ -183,6 +208,8 @@ services: ports: - "8112:8112" - "58846:58846" + networks: + - public profiles: - disabled restart: unless-stopped @@ -199,6 +226,8 @@ services: - "${STORAGE_PATH}:/srv" ports: - "9999:80" + networks: + - public profiles: - base restart: unless-stopped @@ -206,8 +235,6 @@ services: mealie: container_name: mealie image: hkotel/mealie:latest - ports: - - ${MEALIE_EXTERNAL_PORT}:${MEALIE_INTERNAL_PORT} environment: PUID: ${PUID} PGID: ${PGID} @@ -216,6 +243,10 @@ services: - mealie.env volumes: - "${DOCKER_STORAGE_PATH}/mealie/data/:/app/data" + ports: + - ${MEALIE_EXTERNAL_PORT}:${MEALIE_INTERNAL_PORT} + networks: + - public restart: unless-stopped rtorrent: @@ -235,6 +266,8 @@ services: - "9443:9443" - "8118:8118" - "6881:6881" + networks: + - public profiles: - base restart: unless-stopped @@ -249,6 +282,8 @@ services: volumes: - "${STORAGE_PATH}/media/comics:/manga" - "${DOCKER_STORAGE_PATH}/kavita:/kavita/config" + networks: + - public profiles: - base restart: unless-stopped @@ -265,6 +300,8 @@ services: - "${DOCKER_STORAGE_PATH}/webhook/scripts:/var/webhook" ports: - "${WEBHOOK_EXTERNAL_PORT}:${WEBHOOK_INTERNAL_PORT}" + networks: + - public profiles: - base - infra @@ -282,6 +319,8 @@ services: - ${VALHEIM_EXTERNAL_PORT}:${VALHEIM_INTERNAL_PORT} cap_add: - SYS_NICE + networks: + - public profiles: - disabled restart: unless-stopped @@ -295,6 +334,8 @@ services: ports: - 26900-26902:26900-26902/udp - 18500:8080 + networks: + - public profiles: - disabled restart: unless-stopped @@ -307,9 +348,14 @@ services: volumes: - snibox-static:/var/www/html networks: - - default - depends_on: - - snibox_backend + - public + # served by caddy + # - snibox + profiles: + # static files are served by caddy + - disabled + # depends_on: + # - snibox_backend snibox_backend: image: snibox/snibox:latest @@ -330,23 +376,20 @@ services: # 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 + - caddy - postgres - # depends_on: - # - database - - # database: - # image: postgres:10.7-alpine - # volumes: - # - pg-data:/var/lib/postgresql/data + # served by caddy + # - snibox networks: - default: + caddy: + attachable: true + internal: true + public: + attachable: true postgres: external: true