From 4661f1ab0e6e50a3d4359f6b02f346c174d8e9f1 Mon Sep 17 00:00:00 2001
From: Sascha Brendel <code@lednerb.de>
Date: Tue, 9 May 2017 00:55:15 +0200
Subject: [PATCH] Improved caddy support to latest ENV-config.

---
 docker-compose.yml | 13 ++++++-------
 env-example        |  6 ++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7cca302..43e72d0 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 2a38efb..deafc6e 100644
--- a/env-example
+++ b/env-example
@@ -215,6 +215,12 @@ BLACKFIRE_CLIENT_TOKEN=<client_token>
 BLACKFIRE_SERVER_ID=<server_id>
 BLACKFIRE_SERVER_TOKEN=<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 .................................