A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: caddy config is not used correctly
aminnausinb6a38e17c3a0
diff --git a/docker-compose.yaml b/docker-compose.yamlindex bd7d4e6f..45aa9bb0 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -31,21 +31,16 @@ services:- SHARED_GID=9999healthcheck:test: curl --fail http://${APP_HOST:-app.test}:8080/api/health || exit 1- # test: ['CMD', 'sh', '-c', 'test -f /var/www/html/shared/.env && curl --fail http://${APP_HOST:-app.test}:8080/api/health']- #-f /var/www/html/shared/.env &&- interval: 15s- timeout: 10s+ start_period: 10s+ interval: 5sretries: 3depends_on:postgres:condition: service_healthy- # volume-prep:- # condition: service_completed_successfully+ volume-prep:+ condition: service_completed_successfullyenv_file:- .env- labels:- caddy: ${APP_HOST:-app.test}- caddy.reverse_proxy: '* {{upstreams 8080}}'networks:mediaServer-db:default:@@ -121,9 +116,6 @@ services:- 6001environment:- LOG_FILENAME=laravel-ws.log- labels:- caddy: ${APP_HOST:-app.test}- caddy.reverse_proxy: '* {{upstreams 6001}}'stop_grace_period: 5sstop_signal: SIGTERMdepends_on:@@ -136,19 +128,21 @@ services:default:aliases: []caddy:- image: 'caddy:2.9.1-alpine'+ image: "lucaslorentz/caddy-docker-proxy:ci-alpine"container_name: caddyports:- 80:80- 443:443- - 443:443/udpvolumes:- ./docker/etc/caddy/Caddyfile:/etc/caddy/Caddyfile+ - /var/run/docker.sock:/var/run/docker.sock:ro+ - ./caddy/data:/data+ - ./caddy/config:/config- ./logs/caddy:/var/log/caddy- - /var/run/docker.sock:/var/run/docker.sockrestart: unless-stoppedenvironment:- - CADDY_INGRESS_NETWORKS=proxy_network+ - CADDY_DOCKER_CADDYFILE_PATH=/etc/caddy/Caddyfile+ - CADDY_INGRESS_NETWORKS=defaultpostgres:image: bitnami/postgresql:17.2.0container_name: database