From ff20333d8c19945a6eaa88a3c8c03b05f5eb1f54 Mon Sep 17 00:00:00 2001
From: G Roques <groques360@gmail.com>
Date: Tue, 14 Nov 2017 09:41:58 -0600
Subject: [PATCH 1/7] Fix logo covering links in mobile drawer menu (Closes
 #1252)

---
 .../layouts/partials/drawer.html                   |  1 +
 .../static/stylesheets/highlight/highlight.css     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
index 052b48a..62e6fa2 100644
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
@@ -5,6 +5,7 @@
         <div class="logo">
           <img src="{{ $.Site.BaseURL }}{{ . }}">
         </div>
+        Laradock
       {{ end }}
       <!--<div class="name">-->
         <!--<strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>-->
diff --git a/DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css b/DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css
index 179f790..6f2f2d8 100644
--- a/DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css
+++ b/DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css
@@ -108,9 +108,17 @@ font-weight:700;
     OVERRIDING THE DEFAULT STYLES - By Mahmoud Zalt (mahmoud@zalt.me) for Laradock.io
 */
 
-.project .logo img{
-    width: 140px;
-    height: 140px;
+
+.project .logo img {
+    max-width: 100%;
+    height: auto;
     background: transparent;
     border-radius: 0%;
 }
+
+.project .banner {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  font-weight: bold;
+}
\ No newline at end of file

From 5bcb99dfb9b9fcec3ce8c9537465a7ed44a3beaa Mon Sep 17 00:00:00 2001
From: huadong zuo <admin@zuohuadong.cn>
Date: Wed, 15 Nov 2017 13:00:57 +0800
Subject: [PATCH 2/7] add git  & Chinese users friendly.

China can not access  golang.org.
---
 caddy/Dockerfile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index aca00cd..70d69c3 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,17 +1,15 @@
-FROM golang
+FROM zuohuadong/caddy:alpine
+
 
 MAINTAINER Huadong Zuo <admin@zuohuadong.cn>
 
-ARG plugins="git"
+ARG plugins="cors"
 
-## If you come frome china, please ues it.
+## ARG plugins="cors cgi cloudflare azure linode"
 
-# RUN echo "172.217.6.127 golang.org" >> /etc/hosts
 
-RUN go get github.com/abiosoft/caddyplug/caddyplug \
-    && caddyplug install-caddy \
-    && caddyplug install git
-RUN caddy --version
+RUN caddyplug install ${plugins}
+    
 
 EXPOSE 80 443 2015
 

From 9835a208635b02dcfafd2f2781d24db80efdd05c Mon Sep 17 00:00:00 2001
From: huadong zuo <admin@zuohuadong.cn>
Date: Wed, 15 Nov 2017 13:05:26 +0800
Subject: [PATCH 3/7] Remove useless...

Remove useless...
---
 env-example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/env-example b/env-example
index 9c40191..a46bff3 100644
--- a/env-example
+++ b/env-example
@@ -95,7 +95,6 @@ PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE=false
 PHP_FPM_INSTALL_MYSQLI=false
 PHP_FPM_INSTALL_PGSQL=false
-PHP_FPM_INSTALL_POSTGRES=false
 PHP_FPM_INSTALL_TOKENIZER=false
 PHP_FPM_INSTALL_INTL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false

From 50a3e24db8292db2617f8e0119fb46948f5edf3f Mon Sep 17 00:00:00 2001
From: Ricardo Seriani <ricardo.seriani@gmail.com>
Date: Thu, 16 Nov 2017 12:13:00 -0200
Subject: [PATCH 4/7] Remove the github paragraph on header

Remove the github paragraph on header, since it already has a link to github using aria to accessibility
---
 .../themes/hugo-material-docs/layouts/partials/header.html       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
index 472324c..526aec8 100644
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
@@ -21,7 +21,6 @@
     <div class="button button-github" role="button" aria-label="GitHub">
         <a style="padding: 0px; font-size:40px" href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
-      <p style="font-size: 18px; padding: 8px">Github</p>
     {{ end }}
     
     <!-- TODO: disabled until Hugo supports the generation of a content index natively 

From 8dea201b689c40ad218d9d1f59a7f1fa28e50161 Mon Sep 17 00:00:00 2001
From: Thorvald Falkenburg <thorvald.falkenburg@gmail.com>
Date: Thu, 16 Nov 2017 21:31:43 +0100
Subject: [PATCH 5/7] Remove python installation from Dockerfile-71

Python can be installed by using the WORKSPACE_INSTALL_PYTHON
variable in the .env file. Fixes #1238
---
 workspace/Dockerfile-71 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
index 2fdfe9f..9f42137 100644
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -54,9 +54,7 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
-    apt-get update -yqq && \
-    apt-get install -y python2.7
+    useradd -u ${PUID} -g laradock -m laradock
 
 #####################################
 # SOAP:
@@ -686,8 +684,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
 # Clean up
 USER root
 RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    npm config set python /usr/bin/python2.7
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Set default work directory
 WORKDIR /var/www

From cf5b1af31a4b247339b327a76fc6342d54a498e9 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@marmaladesoul.com>
Date: Tue, 21 Nov 2017 09:59:11 +1300
Subject: [PATCH 6/7] Fixes #353 and allows easier dev & prod environments by
 splitting dev-specific configuration into a separate docker-compose.

---
 docker-compose.dev.yml | 9 +++++++++
 docker-compose.yml     | 2 --
 env-example            | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..ed1e80f
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,9 @@
+version: "2"
+
+services:
+
+### Applications Code Container #############################
+
+    applications:
+      volumes:
+        - ${APPLICATION}:/var/www
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d35206..aedcf00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,6 @@ services:
 
     applications:
       image: tianon/true
-      volumes:
-        - ${APPLICATION}:/var/www
 
 ### Workspace Utilities Container ###########################
 
diff --git a/env-example b/env-example
index 9c40191..5c59a29 100644
--- a/env-example
+++ b/env-example
@@ -2,6 +2,11 @@
 # General Setup
 ###########################################################
 
+### Docker compose files ###############################################################################################
+# Select which docker-compose files to include.
+
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+
 ### Application Path ###################################################################################################
 # Point to your code, will be available at `/var/www`.
 

From 73b95357ac661a718ade6a9e0b963c2472c4138b Mon Sep 17 00:00:00 2001
From: Jeff <jeff@marmaladesoul.com>
Date: Wed, 22 Nov 2017 10:48:22 +1300
Subject: [PATCH 7/7] Specifying included docker-compose files in the .env is
 more flexible than hardcoding in the shell script.

---
 env-example | 3 +++
 sync.sh     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/env-example b/env-example
index 05e1e64..64936c7 100644
--- a/env-example
+++ b/env-example
@@ -7,6 +7,9 @@
 
 COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
 
+# Replace the above with the following line if you wish to use docker-sync.
+# COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
+
 ### Application Path ###################################################################################################
 # Point to your code, will be available at `/var/www`.
 
diff --git a/sync.sh b/sync.sh
index 6955358..0f835b3 100755
--- a/sync.sh
+++ b/sync.sh
@@ -59,7 +59,7 @@ if [ "$1" == "up" ] ; then
 
     print_style "Initializing Docker Compose\n" "info"
     shift # removing first argument
-    docker-compose -f docker-compose.yml -f docker-compose.sync.yml up -d ${@}
+    docker-compose up -d ${@}
 
 elif [ "$1" == "down" ]; then
     print_style "Stopping Docker Compose\n" "info"