Merge pull request #1262 from jeff-h/issue-171

Fixes #353 and allows easier dev & prod environments

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 

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 \
+RUN caddyplug install ${plugins}
-    && caddyplug install-caddy \
+    
-    && caddyplug install git
-RUN caddy --version
 
 EXPOSE 80 443 2015
 

docker-compose.dev.yml

@@ -0,0 +1,9 @@
+version: "2"
+
+services:
+
+### Applications Code Container #############################
+
+    applications:
+      volumes:
+        - ${APPLICATION}:/var/www

docker-compose.yml

@@ -6,8 +6,6 @@ services:
 
     applications:
       image: tianon/true
-      volumes:
-        - ${APPLICATION}:/var/www
 
 ### Workspace Utilities Container ###########################
 

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`.
 
@@ -95,7 +100,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

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 && \
+    useradd -u ${PUID} -g laradock -m laradock
-    apt-get update -yqq && \
-    apt-get install -y python2.7
 
 #####################################
 # 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/* \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-    npm config set python /usr/bin/python2.7
 
 # Set default work directory
 WORKDIR /var/www