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

Fixes #353 and allows easier dev & prod environments

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>-->

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 

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;
+.project .logo img {
-    height: 140px;
+    max-width: 100%;
+    height: auto;
     background: transparent;
     border-radius: 0%;
 }
+
+.project .banner {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  font-weight: bold;
+}

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 ###########################
 
@@ -485,7 +483,7 @@ services:
       ports:
         - "5050:5050"
       volumes:
-        - ${DATA_SAVE_PATH}/pgadmin-backup:/var/lib/pgadmin4/data/storage/pgadmin4
+        - ${DATA_SAVE_PATH}/pgadmin-backup:/var/lib/pgadmin/storage/pgadmin4
       depends_on:
         - postgres
       networks:

env-example

@@ -1,31 +1,52 @@
-############################
+###########################################################
 # General Setup
-############################
+###########################################################
 
-### Application Path
+### Docker compose files ###############################################################################################
-# Point to your application code, will be available at `/var/www`.
+# 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`.
 
 APPLICATION=../
 
-### Data Path:
+### PHP Version ########################################################################################################
-# For all storage systems.
+# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 71 - 70 - 56
-
-DATA_SAVE_PATH=~/.laradock/data
-
-### PHP version
-# Applies to the Workspace and PHP-FPM containers (Does not apply to HHVM)
-# Accepted values: 71 - 70 - 56
 
 PHP_VERSION=71
 
-### PHP interpreter
+### PHP Interpreter ####################################################################################################
-# Accepted values: hhvm - php-fpm
+# Select the PHP Interpreter. Accepted values: hhvm - php-fpm
 
 PHP_INTERPRETER=php-fpm
 
-############################
+### Data Path ##########################################################################################################
+# Choose storage path on your machine. For all storage systems.
+
+DATA_SAVE_PATH=~/.laradock/data
+
+### Docker Host IP #####################################################################################################
+# Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1`
+
+DOCKER_HOST_IP=10.0.75.1
+
+### Remote Interpreter #################################################################################################
+# Choose a Remote Interpreter entry matching name. Default is `laradock`
+
+PHP_IDE_CONFIG=serverName=laradock
+
+### Windows Path #######################################################################################################
+# A fix for Windows users, to ensure the application path works.
+
+COMPOSE_CONVERT_WINDOWS_PATHS=1
+
+########################################################################################################################
+
+###########################################################
 # Containers Customization
-############################
+###########################################################
 
 ### WORKSPACE ##########################################################################################################
 
@@ -79,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
@@ -299,26 +319,4 @@ LARAVEL_ECHO_SERVER_PORT=6001
 
 DOCKER_SYNC_STRATEGY=native_osx
 
-##### TO BE CONTINUE .................................
+########################################################################################################################
-
-# ......... Missing: neo4j mongo rethinkdb redis aerospike pgadmin...
-# .........
-# .........
-
-############################
-# Miscellaneous
-############################
-
-# Replace with your Docker Host IP (will be appended to /etc/hosts)
-
-DOCKER_HOST_IP=10.0.75.1
-
-
-# The Remote Interpreter entry matching name `laradock`
-
-PHP_IDE_CONFIG=serverName=laradock
-
-
-# Fix for windows users to make sure the application path works.
-
-COMPOSE_CONVERT_WINDOWS_PATHS=1

laravel-echo-server/Dockerfile

@@ -6,6 +6,13 @@ WORKDIR /usr/src/app
 
 # Install app dependencies
 COPY package.json /usr/src/app/
+
+RUN apk add --update \
+    python \
+    python-dev \
+    py-pip \
+    build-base
+
 RUN npm install
 
 # Bundle app source

pgadmin/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Huadong Zuo <admin@zuohuadong.cn>
 
 # user: pgadmin4@pgadmin.org
 # password: admin
-# pg_dump in  "/usr/bin"
+# pg_dump & postgresql all in  "/usr/bin"
-# backup in "/var/lib/pgadmin4/data/storage/pgadmin4/"
+# backup in "/var/lib/pgadmin/storage/pgadmin4"
 
 EXPOSE 5050

workspace/Dockerfile-56

@@ -16,6 +16,9 @@ FROM laradock/workspace:1.9-56
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+# Remove Faillog and Lastlog to reduce the size of the final image.
+RUN rm /var/log/lastlog /var/log/faillog
+
 #
 #--------------------------------------------------------------------------
 # Mandatory Software's Installation

workspace/Dockerfile-70

@@ -16,6 +16,9 @@ FROM laradock/workspace:1.9-70
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+# Remove Faillog and Lastlog to reduce the size of the final image.
+RUN rm /var/log/lastlog /var/log/faillog
+
 #
 #--------------------------------------------------------------------------
 # Mandatory Software's Installation

workspace/Dockerfile-71

@@ -16,6 +16,9 @@ FROM laradock/workspace:1.9-71
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+# Remove Faillog and Lastlog to reduce the size of the final image.
+RUN rm /var/log/lastlog /var/log/faillog
+
 #
 #--------------------------------------------------------------------------
 # Mandatory Software's Installation
@@ -51,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:
@@ -683,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