From 31d21c74a0e541d1e7c9be15e13b51dbba03b50c Mon Sep 17 00:00:00 2001
From: wxb <wxb0328@icloud.com>
Date: Mon, 8 May 2017 01:42:46 +0800
Subject: [PATCH 1/2] add swoole extension config

---
 env-example           |  1 +
 php-fpm/Dockerfile-56 | 11 +++++++++++
 php-fpm/Dockerfile-70 | 11 +++++++++++
 php-fpm/Dockerfile-71 | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/env-example b/env-example
index 2a38efb5..96d95b84 100644
--- a/env-example
+++ b/env-example
@@ -68,6 +68,7 @@ PHP_FPM_INSTALL_MYSQLI=false
 PHP_FPM_INSTALL_TOKENIZER=false
 PHP_FPM_INSTALL_INTL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false
+PHP_FPM_INSTALL_SWOOLE=false
 
 ### NGINX ##############################################################################################################
 
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index 3ad2ad86..761ef299 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -92,6 +92,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     &&  docker-php-ext-enable redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 5
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl install swoole \
+    &&  docker-php-ext-enable swoole \
+;fi
+
 #####################################
 # MongoDB:
 #####################################
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 99fda381..9c39fa17 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -89,6 +89,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     &&  docker-php-ext-enable redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 7
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl install swoole \
+    &&  docker-php-ext-enable swoole \
+;fi
+
 #####################################
 # MongoDB:
 #####################################
diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71
index ba8101fc..668f29e1 100644
--- a/php-fpm/Dockerfile-71
+++ b/php-fpm/Dockerfile-71
@@ -89,6 +89,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     &&  docker-php-ext-enable redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 7
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl install swoole \
+    &&  docker-php-ext-enable swoole \
+;fi
+
 #####################################
 # MongoDB:
 #####################################
@@ -166,7 +177,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
     # Fix dependencies for PHPUnit within aerospike extension
     apt-get update -yqq && \
     apt-get -y install sudo wget && \
-    
+
     # Install the php aerospike extension
     curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
     && mkdir -p aerospike-client-php \

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 2/2] 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 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=<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 .................................