diff --git a/docker-compose.yml b/docker-compose.yml index 7cca302d..43e72d0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -399,16 +399,15 @@ services: caddy: build: ./caddy - ports: - - "80:80" - - "443:443" - - "2015:2015" volumes_from: - applications volumes: - - ./caddy/Caddyfile:/etc/Caddyfile - - ./logs/caddy:/var/log/caddy - - caddy:/root/.caddy + - ${CADDY_CUSTOM_CADDYFILE}:/etc/Caddyfile + - ${CADDY_HOST_LOG_PATH}:/var/log/caddy + - ${DATA_SAVE_PATH}:/root/.caddy + ports: + - "${CADDY_HOST_HTTP_PORT}:80" + - "${CADDY_HOST_HTTPS_PORT}:443" depends_on: - php-fpm networks: diff --git a/env-example b/env-example index 2a38efb5..deafc6e4 100644 --- a/env-example +++ b/env-example @@ -215,6 +215,12 @@ BLACKFIRE_CLIENT_TOKEN= BLACKFIRE_SERVER_ID= BLACKFIRE_SERVER_TOKEN= +### CADDY ############################################################################################################## + +CADDY_HOST_HTTP_PORT=80 +CADDY_HOST_HTTPS_PORT=443 +CADDY_HOST_LOG_PATH=./logs/caddy +CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile ##### TO BE CONTINUE .................................