Issues 563 (#580)

* https://github.com/laradock/laradock/issues/563
hotfix

* https://github.com/laradock/laradock/issues/563
\r

* https://github.com/laradock/laradock/issues/563
\r

.env

@@ -0,0 +1 @@
+COMPOSE_CONVERT_WINDOWS_PATHS=1

.gitignore

@@ -1,4 +1,3 @@
 .idea
 /logs
 /data
-.env

README-zh.md

@@ -469,7 +469,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*"
 系统默认LaraDock假定Laravel应用在LaraDock的父级目录中
 By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
 
-自新Laravel应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
+更新Laravel应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
 
 ```yaml
     application:

docker-compose.yml

@@ -25,6 +25,9 @@ services:
                 - INSTALL_V8JS_EXTENSION=false
                 - COMPOSER_GLOBAL_INSTALL=false
                 - INSTALL_WORKSPACE_SSH=false
+                - INSTALL_LARAVEL_ENVOY=false
+                - INSTALL_DEPLOYER=false
+                - INSTALL_LINUXBREW=false
                 - PUID=1000
                 - PGID=1000
                 - NODE_VERSION=stable
@@ -49,8 +52,11 @@ services:
                 - INSTALL_SOAP=false
                 - INSTALL_MONGO=false
                 - INSTALL_ZIP_ARCHIVE=false
+                - INSTALL_BCMATH=false
+                - INSTALL_PHPREDIS=false
                 - INSTALL_MEMCACHED=false
                 - INSTALL_OPCACHE=false
+                - INSTALL_EXIF=false
                 - INSTALL_AEROSPIKE_EXTENSION=false
                 - CODEIGNITER=false
             dockerfile: Dockerfile-70
@@ -133,7 +139,7 @@ services:
     mariadb:
         build: ./mariadb
         volumes:
-            - mysql:/var/lib/mysql
+            - mariadb:/var/lib/mysql
         ports:
             - "3306:3306"
         environment:
@@ -189,6 +195,15 @@ services:
         volumes:
             - mongo:/data/db
 
+### RethinkDB Container #######################################
+
+    rethinkdb:
+        build: ./rethinkdb
+        ports:
+            - "8090:8080"
+        volumes:
+            - rethinkdb:/data/rethinkdb_data
+
 ### Redis Container #########################################
 
     redis:
@@ -306,13 +321,20 @@ services:
         build: ./elasticsearch
         volumes:
             - elasticsearch-data:/usr/share/elasticsearch/data
-            - elasticsearch-pkugins:/usr/share/elasticsearch/data
+            - elasticsearch-plugins:/usr/share/elasticsearch/data
         ports:
             - "9200:9200"
             - "9300:9300"
         links:
             - php-fpm
 
+### Selenium Container #########################################
+
+    selenium:
+        build: ./selenium
+        ports:
+            - "4444:4444"
+
 ### Volumes Setup ###########################################
 
 volumes:
@@ -330,6 +352,8 @@ volumes:
         driver: "local"
     mongo:
         driver: "local"
+    rethinkdb:
+        driver: "local"
     phpmyadmin:
         driver: "local"
     aerospike:
@@ -338,7 +362,7 @@ volumes:
         driver: "local"
     elasticsearch-data:
         driver: "local"
-    elasticsearch-pkugins:
+    elasticsearch-plugins:
         driver: "local"
     sessions:    ## nothing is connected to this (- ./data/sessions:/sessions)
         driver: "local"

nginx/sites/default.conf

@@ -15,6 +15,8 @@ server {
         try_files $uri /index.php =404;
         fastcgi_pass php-upstream;
         fastcgi_index index.php;
+        fastcgi_buffers 16 16k; 
+        fastcgi_buffer_size 32k;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
     }

php-fpm/Dockerfile-56

@@ -45,7 +45,7 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
     # Install the soap extension
     apt-get -y update && \
     apt-get -y install libxml2-dev && \ 
-    docker-php-ext-install soap && \
+    docker-php-ext-install soap \
 ;fi
 
 #####################################
@@ -84,6 +84,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     docker-php-ext-enable zip \
 ;fi
 
+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

php-fpm/Dockerfile-70

@@ -60,6 +60,17 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
     docker-php-ext-enable xdebug \
 ;fi
 
+#####################################
+# PHP REDIS EXTENSION FOR PHP 7.0
+#####################################
+ARG INSTALL_PHPREDIS=false
+RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
+    # Install Php Redis Extension
+    pecl install -o -f redis \
+    &&  rm -rf /tmp/pear \
+    &&  docker-php-ext-enable redis \
+;fi
+
 # Copy xdebug configration for remote debugging
 COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
@@ -85,6 +96,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     docker-php-ext-enable zip \
 ;fi
 
+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################
@@ -107,6 +128,18 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
     && docker-php-ext-enable memcached \
 ;fi
 
+#####################################
+# Exif:
+#####################################
+
+ARG INSTALL_EXIF=false
+RUN if [ ${INSTALL_EXIF} = true ]; then \
+    # Enable Exif PHP extentions requirements
+    docker-php-ext-install exif && \
+    docker-php-ext-enable exif \
+;fi
+
+
 #####################################
 # PHP Aerospike:
 #####################################

production-docker-compose.yml

@@ -1,62 +0,0 @@
-version: '2'
-
-services:
-
-### Workspace Utilities Container ###########################
-
-    workspace:
-        build:
-            context: ./workspace
-            args:
-                - INSTALL_XDEBUG=false
-                - INSTALL_MONGO=false
-                - INSTALL_NODE=false
-                - INSTALL_YARN=false
-                - INSTALL_DRUSH=false
-                - INSTALL_AEROSPIKE_EXTENSION=false
-                - COMPOSER_GLOBAL_INSTALL=false
-                - INSTALL_WORKSPACE_SSH=false
-                - PUID=1000
-                - PGID=1000
-                - NODE_VERSION=stable
-        volumes_from:
-            - volumes_source
-        ports:
-           - "22:22"
-        tty: true
-
-### PHP-FPM Container #######################################
-
-    php-fpm:
-        build:
-            context: ./php-fpm
-            args:
-                - INSTALL_XDEBUG=false
-                - INSTALL_MONGO=false
-                - INSTALL_ZIP_ARCHIVE=false
-                - INSTALL_MEMCACHED=false
-                - INSTALL_OPCACHE=false
-                - INSTALL_AEROSPIKE_EXTENSION=false
-            dockerfile: Dockerfile-70
-        volumes_from:
-            - volumes_source
-        expose:
-            - "9000"
-        links:
-            - workspace
-
-### Application Code Container ######################
-
-    volumes_source:
-        image: tianon/true
-        volumes:
-            - ../:/var/www
-
-### Databases Data Container ################################
-
-    volumes_data:
-        image: tianon/true
-        volumes:
-#            - ./data/mysql:/var/lib/mysql
-
-### Add All your Software Containers below ###############################

rethinkdb/Dockerfile

@@ -0,0 +1,11 @@
+FROM rethinkdb:latest
+
+MAINTAINER Cristian Mello <cristianc.mello@gmail.com>
+
+VOLUME /data/rethinkdb_data
+
+RUN cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
+
+CMD ["rethinkdb", "--bind", "all"]
+
+EXPOSE 8080

selenium/Dockerfile

@@ -0,0 +1,5 @@
+FROM selenium/standalone-chrome
+
+MAINTAINER Edmund Luong <edmundvmluong@gmail.com>
+
+EXPOSE 4444

workspace/Dockerfile

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #
 
-FROM laradock/workspace:1.2
+FROM laradock/workspace:1.3
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -74,12 +74,34 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
     composer global install \
 ;fi
 
+# Export composer vendor path
+RUN echo "" >> ~/.bashrc && \
+echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc
+
 #####################################
 # Crontab
 #####################################
 USER root
 
-COPY ./crontab /var/spool/cron/crontabs
+COPY ./crontab /etc/cron.d
+RUN chmod -R 644 /etc/cron.d
+
+#####################################
+# User Aliases
+#####################################
+
+USER laradock
+COPY ./aliases.sh /home/laradock/aliases.sh
+RUN echo "" >> ~/.bashrc && \
+    echo "# Load Custom Aliases" >> ~/.bashrc && \
+    echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
+    echo "" >> ~/.bashrc
+    
+USER root
+RUN echo "" >> ~/.bashrc && \
+    echo "# Load Custom Aliases" >> ~/.bashrc && \
+    echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
+    echo "" >> ~/.bashrc
 
 #####################################
 # xDebug:
@@ -268,6 +290,73 @@ USER laradock
 RUN echo "" >> ~/.bashrc && \
     echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc
 
+#####################################
+# Laravel Artisan Alias
+#####################################
+USER root
+
+RUN echo "" >> ~/.bashrc && \
+    echo 'alias art="php artisan"' >> ~/.bashrc
+
+#####################################
+# Laravel Envoy:
+#####################################
+USER laradock
+
+ARG INSTALL_LARAVEL_ENVOY=true
+ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY}
+
+RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
+    # Install the Laravel Envoy
+    composer global require "laravel/envoy=~1.0" \
+;fi
+
+#####################################
+# Deployer:
+#####################################
+USER laradock
+
+ARG INSTALL_DEPLOYER=false
+ENV INSTALL_DEPLOYER ${INSTALL_DEPLOYER}
+
+RUN if [ ${INSTALL_DEPLOYER} = true ]; then \
+    # Install the Deployer
+    composer global require "deployer/deployer" \
+;fi
+
+#####################################
+# Linuxbrew:
+#####################################
+USER root
+
+ARG INSTALL_LINUXBREW=true
+ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
+
+RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
+
+    # Preparation
+    apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y build-essential make cmake scons curl git \
+      ruby autoconf automake autoconf-archive \
+      gettext libtool flex bison \
+      libbz2-dev libcurl4-openssl-dev \
+      libexpat-dev libncurses-dev && \
+
+    # Install the Linuxbrew
+    git clone https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \
+
+    echo "" >> ~/.bashrc && \
+    echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
+
+    # Setup linuxbrew
+    echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \
+    echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \
+    echo 'export MANPATH="$LINUXBREWHOME/man:$MANPATH"' >> ~/.bashrc && \
+    echo 'export PKG_CONFIG_PATH="$LINUXBREWHOME/lib64/pkgconfig:$LINUXBREWHOME/lib/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
+    echo 'export LD_LIBRARY_PATH="$LINUXBREWHOME/lib64:$LINUXBREWHOME/lib:$LD_LIBRARY_PATH"' >> ~/.bashrc \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

workspace/aliases.sh

@@ -0,0 +1,71 @@
+#! /bin/bash
+
+# Colors used for status updates
+ESC_SEQ="\x1b["
+COL_RESET=$ESC_SEQ"39;49;00m"
+COL_RED=$ESC_SEQ"31;01m"
+COL_GREEN=$ESC_SEQ"32;01m"
+COL_YELLOW=$ESC_SEQ"33;01m"
+COL_BLUE=$ESC_SEQ"34;01m"
+COL_MAGENTA=$ESC_SEQ"35;01m"
+COL_CYAN=$ESC_SEQ"36;01m"
+
+# Commonly Used Aliases
+alias ..="cd .."
+alias c="clear"
+alias cla="clear && ls -l"
+alias cll="clear && ls -la"
+alias cls="clear && ls"
+alias code="cd /var/www"
+alias ea="vi ~/aliases"
+alias g="gulp"
+alias home="cd ~"
+alias npm-global="npm list -g --depth 0"
+alias ra="reload"
+alias reload="source ~/.aliases && echo \"$COL_GREEN ==> Aliases Reloaded... $COL_RESET \n \""
+alias run="npm run"
+alias tree="xtree"
+
+# Laravel / PHP Alisases
+alias art="php artisan"
+alias artisan="php artisan"
+alias cdump="composer dump-autoload -o"
+alias composer:dump="composer dump-autoload -o"
+alias db:reset="php artisan migrate:reset && php artisan migrate --seed"
+alias migrate="php artisan migrate"
+alias seed="php artisan:seed"
+alias phpunit="./vendor/bin/phpunit"
+
+
+# requires installation of 'https://www.npmjs.com/package/npms-cli'
+alias npms="npms search"
+
+# requires installation of 'https://www.npmjs.com/package/package-menu-cli'
+alias pm="package-menu"
+
+# requires installation of 'https://www.npmjs.com/package/pkg-version-cli'
+alias pv="package-version"
+
+# requires installation of 'https://github.com/sindresorhus/latest-version-cli'
+alias lv="latest-version"
+
+# git aliases
+alias gaa="git add ."
+alias gd="git --no-pager diff"
+alias git-revert="git reset --hard && git clean -df"
+alias gs="git status"
+alias whoops="git reset --hard && git clean -df"
+
+
+# Create a new directory and enter it
+function mkd() {
+    mkdir -p "$@" && cd "$@"
+}
+
+function md() {
+    mkdir -p "$@" && cd "$@"
+}
+
+function xtree {
+    find ${1:-.} -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+}

workspace/crontab/laradock

@@ -0,0 +1 @@
+* * * * * laradock php /var/www/artisan schedule:run >> /dev/null 2>&1

workspace/crontab/root

@@ -1 +0,0 @@
-* * * * * php /var/www/artisan schedule:run >> /dev/null 2>&1

xdebugPhpFpm

@@ -4,7 +4,7 @@
 
 
 # Grab full name of php-fpm container
-PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d" " -f 1)
+PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d " " -f 1)
 
 
 # Grab OS type