Merge pull request #1035 from bestlong/fix-caddy-service-build-failed

fix caddy service build failed

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+### Thank you for contributing to Laradock.
+
+##### Make sure you completed the basic 3 steps below:
+
+- [] I've read the simple [Contribution Guide](http://laradock.io/contributing).
+- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
+- [] I enjoyed my time contributing and making developer's life easier :)

.travis.yml

@@ -41,8 +41,11 @@ env:
 
 # Installing a newer Docker version
 before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
   - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine
+  - sudo apt-get -y install docker-ce
+  - docker version
 
 script: ./travis-build.sh
 

DOCUMENTATION/content/guides/index.md

@@ -55,6 +55,10 @@ $root@server:~/laravel/ cd laradock
 $root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
 $root@server:~/chmod +x /usr/local/bin/docker-compose
 ```
+##  Enter the laradock folder and rename env-example to .env.
+```
+$root@server:~/laravel/laradock# cp env-example .env
+```
 
 ## Create Your Laradock Containers
 
@@ -138,8 +142,8 @@ And add `server_name` (your custom domain)
 ## Rebuild Your Nginx
 
 ```
-$root@server:~/laravel/laradock/nginx# docker-compose down
+$root@server:~/laravel/laradock# docker-compose down
-$root@server:~/laravel/laradock/nginx# docker-compose build nginx
+$root@server:~/laravel/laradock# docker-compose build nginx
 ```
 
 ## Re Run Your Containers MYSQL and NGINX

DOCUMENTATION/content/introduction/index.md

@@ -83,17 +83,21 @@ In adhering to the separation of concerns principle as promoted by Docker, Larad
 You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
 
 - **Database Engines:**
-MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.
+MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres-PostGIS.
+- **Database Management:**
+PhpMyAdmin - Adminer - PgAdmin
 - **Cache Engines:**
 Redis - Memcached - Aerospike
 - **PHP Servers:**
 NGINX - Apache2 - Caddy
 - **PHP Compilers:**
 PHP FPM - HHVM
-- **Message Queuing:**
+- **Message Queueing:**
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker
+Beanstalkd - RabbitMQ - PHP Worker
-- **Tools:**
+- **Queueing Management:**
-HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog - [Blackfire](https://blackfire.io)...
+Beanstalkd Console - RabbitMQ Console
+- **Random Tools:**
+HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Mailhog - Minio - Varnish - Swoole - Laravel Echo...
 
 Laradock introduces the **Workspace** Image, as a development environment.
 It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose.
@@ -108,7 +112,7 @@ You can choose, which tools to install in your workspace container and other con
 
 
 
-If you can't find your Software in the list, build it yourself and sumit it. Contributions are welcomed :)
+If you can't find your Software in the list, build it yourself and submit it. Contributions are welcomed :)
 
 
 
@@ -148,7 +152,7 @@ Most importantly Docker can run on Development and on Production (same environme
 
 What's better than a **Demo Video**:
 
-- Laradock v5.* (soon or never)
+- Laradock v5.* (should be next!)
 - Laradock [v4.*](https://www.youtube.com/watch?v=TQii1jDa96Y)
 - Laradock [v2.*](https://www.youtube.com/watch?v=-DamFMczwDA)
 - Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)

README.md

@@ -1,6 +1,6 @@
 ![](https://s19.postimg.org/jblfytw9f/laradock-logo.jpg)
 
-[![Build Status](https://travis-ci.org/laradock/laradock.svg?branch=master)](https://travis-ci.org/laradock/laradock)
+[![Build Status](https://travis-ci.org/laradock/laradock.svg?branch=master)](https://travis-ci.org/laradock/laradock) [![GitHub issues](https://img.shields.io/github/issues/laradock/laradock.svg)](https://github.com/laradock/laradock/issues) [![GitHub forks](https://img.shields.io/github/forks/laradock/laradock.svg)](https://github.com/laradock/laradock/network) [![GitHub stars](https://img.shields.io/github/stars/laradock/laradock.svg)](https://github.com/laradock/laradock/stargazers) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/laradock/laradock/master/LICENSE)
 
 > Use Docker first and learn about it later.
 
@@ -23,6 +23,9 @@ A Docker PHP development environment that facilitates running **PHP** Apps on **
 - [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
 - [Thor Erik](https://github.com/thorerik) @thorerik
 - [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
+- [TJ Miller](https://github.com/sixlive) @sixlive
+- [Yu-Lung Shao (Allen)](https://github.com/bestlong) @bestlong
+- [Milan Urukalo](https://github.com/urukalo) @urukalo
 - Join Us.
 
 ## License

adminer/Dockerfile

@@ -8,5 +8,22 @@ MAINTAINER Patrick Artounian <partounian@gmail.com>
 # Add volume for sessions to allow session persistence
 VOLUME /sessions
 
+#####################################
+# SQL SERVER:
+#####################################
+USER root
+ARG INSTALL_MSSQL=false
+ENV INSTALL_MSSQL ${INSTALL_MSSQL}
+RUN if [ ${INSTALL_MSSQL} = true ]; then \
+  set -xe \
+  && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \
+  && pecl channel-update pecl.php.net \
+  && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
+  && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \
+  && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \
+;fi
+
+USER adminer
+
 # We expose Adminer on port 8080 (Adminer's default)
 EXPOSE 8080

caddy/Dockerfile

@@ -2,17 +2,18 @@ FROM alpine:3.4
 
 MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
 
-ENV caddy_version=0.10.0
+ENV caddy_version=0.10.3
+ARG plugins=http.git
 
 LABEL caddy_version="$caddy_version" architecture="amd64"
 
 RUN apk update \
     && apk upgrade \
-    && apk add tar curl git
+    && apk add tar curl git openssh
 
 RUN curl --silent --show-error --fail --location \
         --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-        "https://caddyserver.com/download/linux/amd64?plugins=http.cgi,http.cors,http.expires,http.filemanager,http.git,http.ipfilter,http.realip,tls.dns.cloudflare,tls.dns.digitalocean,tls.dns.dnspod,tls.dns.dyn,tls.dns.googlecloud,tls.dns.linode,tls.dns.namecheap,tls.dns.ovh,tls.dns.route53,tls.dns.vultr" \
+        "https://caddyserver.com/download/linux/amd64?plugins=${plugins}" \
         | tar --no-same-owner -C /usr/bin/ -xz caddy \
     && mv /usr/bin/caddy /usr/bin/caddy \
     && chmod 0755 /usr/bin/caddy

docker-compose.yml

@@ -28,6 +28,7 @@ services:
           - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
           - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
           - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+          - INSTALL_LARAVEL_INSTALLER=${WORKSPACE_INSTALL_LARAVEL_INSTALLER}
           - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER}
           - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW}
           - INSTALL_MC=${WORKSPACE_INSTALL_MC}
@@ -73,6 +74,7 @@ services:
           - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
           - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
           - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
+          - INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
         dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
@@ -195,6 +197,7 @@ services:
         - MYSQL_USER=${MYSQL_USER}
         - MYSQL_PASSWORD=${MYSQL_PASSWORD}
         - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+        - TZ=${WORKSPACE_TIMEZONE}
       volumes:
         - ${DATA_SAVE_PATH}/mysql:/var/lib/mysql
         - ./mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
@@ -214,7 +217,8 @@ services:
         - MYSQL_PASSWORD=${PERCONA_PASSWORD}
         - MYSQL_ROOT_PASSWORD=${PERCONA_ROOT_PASSWORD}
       volumes:
-        - percona:/var/lib/mysql
+        - ${DATA_SAVE_PATH}/percona:/var/lib/mysql
+        - ./percona/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "${PERCONA_PORT}:3306"
       networks:
@@ -242,6 +246,7 @@ services:
       build: ./mariadb
       volumes:
         - ${DATA_SAVE_PATH}/mariadb:/var/lib/mysql
+        - ./mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "${MARIADB_PORT}:3306"
       environment:
@@ -437,7 +442,10 @@ services:
 ### Adminer Container ####################################
 
     adminer:
-      build: ./adminer
+      build:
+        context: ./adminer
+        args:
+          - INSTALL_MSSQL=${ADM_INSTALL_MSSQL}
       ports:
         - "${ADM_PORT}:8080"
       depends_on:
@@ -474,6 +482,19 @@ services:
         - frontend
         - backend
 
+
+### Kibana Container #######################################
+
+    kibana:
+      build: ./kibana
+      ports:
+        - "${KIBANA_HTTP_PORT}:5601"
+      depends_on:
+        - elasticsearch
+      networks:
+        - frontend
+        - backend
+
 ### Certbot Container ##################################
 
     certbot:
@@ -497,6 +518,7 @@ services:
         - "8025:8025"
       networks:
         - frontend
+        - backend
 
 ### Selenium Container ########################################
 
@@ -560,6 +582,7 @@ services:
         - proxy2
 
 ### Jenkins ###################################################
+
     jenkins:
       build: ./jenkins
       environment:
@@ -575,6 +598,19 @@ services:
         - frontend
         - backend
 
+### Laravel Echo Server #######################################
+    laravel-echo-server:
+      build:
+        context: ./laravel-echo-server
+      volumes:
+        - ./laravel-echo-server/laravel-echo-server.json:/app/laravel-echo-server.json:ro
+      ports:
+        - "${LARAVEL_ECHO_SERVER_PORT}:6001"
+      links:
+        - redis
+      networks:
+        - frontend
+        - backend
 
 ### Networks Setup ############################################
 

elasticsearch/Dockerfile

@@ -1,5 +1,3 @@
-FROM elasticsearch:latest
+FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1
-
-MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
 
 EXPOSE 9200 9300

env-example

@@ -10,7 +10,7 @@ APPLICATION=../
 ### Data Path:
 # For all storage systems.
 
-DATA_SAVE_PATH=/tmp
+DATA_SAVE_PATH=~/.laradock/data
 
 ### PHP version
 # Applies to the Workspace and PHP-FPM containers (Does not apply to HHVM)
@@ -41,6 +41,7 @@ WORKSPACE_INSTALL_V8JS=false
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_LARAVEL_ENVOY=false
+WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
 WORKSPACE_INSTALL_DEPLOYER=false
 WORKSPACE_INSTALL_LINUXBREW=false
 WORKSPACE_INSTALL_MC=false
@@ -136,6 +137,10 @@ RABBITMQ_DEFAULT_PASS=guest
 ELASTICSEARCH_HOST_HTTP_PORT=9200
 ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
 
+### KIBANA #############################################################################################################
+
+KIBANA_HTTP_PORT=5601
+
 ### MEMCACHED ##########################################################################################################
 
 MEMCACHED_HOST_PORT=11211
@@ -161,6 +166,7 @@ MINIO_PORT=9000
 ### ADMINER ############################################################################################################
 
 ADM_PORT=8080
+ADM_INSTALL_MSSQL=false
 
 ### PHP MY ADMIN #######################################################################################################
 
@@ -239,6 +245,10 @@ CADDY_HOST_HTTPS_PORT=443
 CADDY_HOST_LOG_PATH=./logs/caddy
 CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile
 
+### LARAVEL ECHO SERVER ################################################################################################
+
+LARAVEL_ECHO_SERVER_PORT=6001
+
 
 ##### TO BE CONTINUE .................................
 

kibana/Dockerfile

@@ -0,0 +1,3 @@
+FROM docker.elastic.co/kibana/kibana:5.4.1
+
+EXPOSE 5601

laravel-echo-server/Dockerfile

@@ -0,0 +1,15 @@
+FROM node:argon
+ 
+# Create app directory
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+ 
+# Install app dependencies
+COPY package.json /usr/src/app/
+RUN npm install
+ 
+# Bundle app source
+COPY laravel-echo-server.json /usr/src/app/laravel-echo-server.json
+ 
+EXPOSE 3000
+CMD [ "npm", "start" ]

laravel-echo-server/laravel-echo-server.json

@@ -0,0 +1,19 @@
+{
+	"authHost": "localhost",
+	"authEndpoint": "/broadcasting/auth",
+	"clients": [],
+	"database": "redis",
+	"databaseConfig": {
+		"redis": {
+			"port": "6379",
+			"host": "redis"
+		}
+	},
+	"devMode": true,
+	"host": null,
+	"port": "6001",
+	"protocol": "http",
+	"socketio": {},
+	"sslCertPath": "",
+	"sslKeyPath": ""
+}

laravel-echo-server/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "laravel-echo-server-docker",
+  "description": "Docker container for running laravel-echo-server",
+  "version": "0.0.1",
+  "license": "MIT",
+  "dependencies": {
+    "laravel-echo-server": "^1.2.8"
+  },
+  "scripts": {
+    "start": "laravel-echo-server start"
+  }
+}

mariadb/docker-entrypoint-initdb.d/createdb.sql.example

@@ -1,8 +1,28 @@
 ###
 ### Copy createdb.sql.example to createdb.sql
-### then uncomment and set database name to create you need databases
+### then uncomment then set database name and username to create you need databases
+#
+# example: .env MYSQL_USER=appuser and need db name is myshop_db
+#
+#    CREATE DATABASE IF NOT EXISTS `myshop_db` ;
+#    GRANT ALL ON `myshop_db`.* TO 'appuser'@'%' ;
+#
+###
+### this sql script is auto run when mariadb container start and $DATA_SAVE_PATH/mariadb not exists.
+###
+### if your $DATA_SAVE_PATH/mariadb is exists and you do not want to delete it, you can run by manual execution:
+###
+###     docker-compose exec mariadb bash
+###     mysql -u root -p < /docker-entrypoint-initdb.d/createdb.sql
 ###
 
-#CREATE DATABASE IF NOT EXISTS `dev_db_1` ;
+#CREATE DATABASE IF NOT EXISTS `dev_db_1` COLLATE 'utf8_general_ci' ;
-#CREATE DATABASE IF NOT EXISTS `dev_db_2` ;
+#GRANT ALL ON `dev_db_1`.* TO 'default'@'%' ;
-#CREATE DATABASE IF NOT EXISTS `dev_db_3` ;
+
+#CREATE DATABASE IF NOT EXISTS `dev_db_2` COLLATE 'utf8_general_ci' ;
+#GRANT ALL ON `dev_db_2`.* TO 'default'@'%' ;
+
+#CREATE DATABASE IF NOT EXISTS `dev_db_3` COLLATE 'utf8_general_ci' ;
+#GRANT ALL ON `dev_db_3`.* TO 'default'@'%' ;
+
+FLUSH PRIVILEGES ;

mssql/create_table.sh

@@ -1,5 +1,5 @@
 #wait for the SQL Server to come up
-sleep 45s
+sleep 45
 
 #run the setup script to create the DB and the schema in the DB
 /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -i setup.sql

mssql/entrypoint.sh

@@ -1,2 +1,2 @@
 #start SQL Server, start the script to create the DB and import the data, start the app
-/opt/mssql/bin/sqlservr.sh & /usr/src/app/create_table.sh & tail -f /dev/null
+/opt/mssql/bin/sqlservr & /usr/src/app/create_table.sh & tail -f /dev/null

mysql/Dockerfile

@@ -2,6 +2,14 @@ FROM mysql:5.7
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+#####################################
+# Set Timezone
+#####################################
+
+ARG TZ=UTC
+ENV TZ ${TZ}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 RUN chown -R mysql:root /var/lib/mysql/
 
 ADD my.cnf /etc/mysql/conf.d/my.cnf

nginx/nginx.conf

@@ -28,7 +28,7 @@ http {
   ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
   
   include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-available/*;
+  include /etc/nginx/sites-available/*.conf;
   open_file_cache off; # Disabled for issue 619
   charset UTF-8;
 }

percona/docker-entrypoint-initdb.d/createdb.sql.example

@@ -1,8 +1,28 @@
 ###
 ### Copy createdb.sql.example to createdb.sql
-### then uncomment and set database name to create you need databases
+### then uncomment then set database name and username to create you need databases
+#
+# example: .env MYSQL_USER=appuser and need db name is myshop_db
+#
+#    CREATE DATABASE IF NOT EXISTS `myshop_db` ;
+#    GRANT ALL ON `myshop_db`.* TO 'appuser'@'%' ;
+#
+###
+### this sql script is auto run when percona container start and $DATA_SAVE_PATH/percona not exists.
+###
+### if your $DATA_SAVE_PATH/percona is exists and you do not want to delete it, you can run by manual execution:
+###
+###     docker-compose exec percona bash
+###     mysql -u root -p < /docker-entrypoint-initdb.d/createdb.sql
 ###
 
-#CREATE DATABASE IF NOT EXISTS `dev_db_1` ;
+#CREATE DATABASE IF NOT EXISTS `dev_db_1` COLLATE 'utf8_general_ci' ;
-#CREATE DATABASE IF NOT EXISTS `dev_db_2` ;
+#GRANT ALL ON `dev_db_1`.* TO 'homestead'@'%' ;
-#CREATE DATABASE IF NOT EXISTS `dev_db_3` ;
+
+#CREATE DATABASE IF NOT EXISTS `dev_db_2` COLLATE 'utf8_general_ci' ;
+#GRANT ALL ON `dev_db_2`.* TO 'homestead'@'%' ;
+
+#CREATE DATABASE IF NOT EXISTS `dev_db_3` COLLATE 'utf8_general_ci' ;
+#GRANT ALL ON `dev_db_3`.* TO 'homestead'@'%' ;
+
+FLUSH PRIVILEGES ;

php-fpm/Dockerfile-56

@@ -246,6 +246,18 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
     docker-php-ext-install ldap \
 ;fi
 
+#####################################
+# SQL SERVER:
+#####################################
+ARG INSTALL_MSSQL=false
+ENV INSTALL_MSSQL ${INSTALL_MSSQL}
+
+RUN if [ ${INSTALL_MSSQL} = true ]; then \
+    apt-get -y install php5-sybase freetds-bin && \
+    cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ && \
+    docker-php-ext-enable mssql pdo pdo_dblib \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-fpm/Dockerfile-70

@@ -258,76 +258,28 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
 #####################################
 # SQL SERVER:
 #####################################
+
 ARG INSTALL_MSSQL=false
 ENV INSTALL_MSSQL ${INSTALL_MSSQL}
-
 RUN if [ ${INSTALL_MSSQL} = true ]; then \
     #####################################
-    # Install Depenencies:
+    # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
     #####################################
-        apt-get update -yqq && \
+    # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
-        apt-get install -y --force-yes wget apt-transport-https curl freetds-common libsybdb5 freetds-bin unixodbc unixodbc-dev && \
+    apt-get update -yqq \
-
+        && apt-get install -y apt-transport-https \
-    #####################################
+        && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
-    #  The following steps were taken from
+        && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
-    #  Microsoft's github account:
-    #  https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways
-    #####################################
-
-    # Add PHP 7 repository
-    # for Debian jessie
-    # And System upgrade
-        echo "deb http://packages.dotdeb.org jessie all" \
-        | tee /etc/apt/sources.list.d/dotdeb.list \
-        && wget -qO- https://www.dotdeb.org/dotdeb.gpg \
-        | apt-key add - \
         && apt-get update -yqq \
-        && apt-get upgrade -qq && \
 
-    # Install UnixODBC
+    # Install Dependencies
-    # Compile odbc_config as it is not part of unixodbc package
+        && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
-        apt-get update -yqq && \
+        && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
-        apt-get install -y whiptail \
+        && locale-gen \
-        unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \
-        && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \
-        && cd unixodbc-*/ \
-        && ./configure && make && make install \
-        && cp -v ./exe/odbc_config /usr/local/bin/ && \
 
-    # Fake uname for install.sh
+    # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
-        printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \
+        && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
-        | tee /usr/local/bin/uname \
+        && docker-php-ext-enable pdo_sqlsrv sqlsrv \
-        && chmod +x /usr/local/bin/uname && \
-
-    # Microsoft ODBC Driver 13 for Linux
-    # Note: There's a copy of this tar on my hubiC
-        wget -nv -O msodbcsql-13.0.0.0.tar.gz \
-        "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \
-        && tar -xf msodbcsql-13.0.0.0.tar.gz \
-        && cd msodbcsql-*/ \
-        && ldd lib64/libmsodbcsql-13.0.so.0.0 \
-        && ./install.sh install --accept-license \
-        && ls -l /opt/microsoft/msodbcsql/ \
-        && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" && \
-
-
-    #####################################
-    # Install sqlsrv y pdo_sqlsrv
-    # extensions:
-    #####################################
-
-    pecl install sqlsrv-4.0.8 && \
-    pecl install pdo_sqlsrv-4.0.8 && \
-
-    #####################################
-    # Set locales for the container
-    #####################################
-
-    apt-get install -y locales \
-    && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
-    && locale-gen \
-    && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \
-    && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \
 ;fi
 
 #

php-fpm/Dockerfile-71

@@ -267,76 +267,26 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
 #####################################
 # SQL SERVER:
 #####################################
+
 ARG INSTALL_MSSQL=false
 ENV INSTALL_MSSQL ${INSTALL_MSSQL}
-
 RUN if [ ${INSTALL_MSSQL} = true ]; then \
     #####################################
-    # Install Depenencies:
+    # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
     #####################################
-        apt-get update -yqq && \
+    # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
-        apt-get install -y --force-yes wget apt-transport-https curl freetds-common libsybdb5 freetds-bin unixodbc unixodbc-dev && \
+    apt-get update -yqq && apt-get install -y apt-transport-https \
-
+        && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
-    #####################################
+        && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
-    #  The following steps were taken from
-    #  Microsoft's github account:
-    #  https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways
-    #####################################
-
-    # Add PHP 7 repository
-    # for Debian jessie
-    # And System upgrade
-        echo "deb http://packages.dotdeb.org jessie all" \
-        | tee /etc/apt/sources.list.d/dotdeb.list \
-        && wget -qO- https://www.dotdeb.org/dotdeb.gpg \
-        | apt-key add - \
         && apt-get update -yqq \
-        && apt-get upgrade -qq && \
 
-    # Install UnixODBC
+    # Install Dependencies
-    # Compile odbc_config as it is not part of unixodbc package
+        && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
-        apt-get update -yqq && \
+        && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
-        apt-get install -y whiptail \
-        unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \
-        && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \
-        && cd unixodbc-*/ \
-        && ./configure && make && make install \
-        && cp -v ./exe/odbc_config /usr/local/bin/ && \
 
-    # Fake uname for install.sh
+    # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
-        printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \
+        && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
-        | tee /usr/local/bin/uname \
+        && docker-php-ext-enable pdo_sqlsrv sqlsrv \
-        && chmod +x /usr/local/bin/uname && \
-
-    # Microsoft ODBC Driver 13 for Linux
-    # Note: There's a copy of this tar on my hubiC
-        wget -nv -O msodbcsql-13.0.0.0.tar.gz \
-        "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \
-        && tar -xf msodbcsql-13.0.0.0.tar.gz \
-        && cd msodbcsql-*/ \
-        && ldd lib64/libmsodbcsql-13.0.so.0.0 \
-        && ./install.sh install --accept-license \
-        && ls -l /opt/microsoft/msodbcsql/ \
-        && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" && \
-
-
-    #####################################
-    # Install sqlsrv y pdo_sqlsrv
-    # extensions:
-    #####################################
-
-    pecl install sqlsrv-4.0.8 && \
-    pecl install pdo_sqlsrv-4.0.8 && \
-
-    #####################################
-    # Set locales for the container
-    #####################################
-
-    apt-get install -y locales \
-    && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
-    && locale-gen \
-    && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \
-    && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \
 ;fi
 
 #

php-fpm/laravel.ini

@@ -11,6 +11,3 @@ upload_max_filesize = 20M
 ; Sets max size of post data allowed.
 ; http://php.net/post-max-size
 post_max_size = 20M
-; Enables the MSSQL extensions
-extension=sqlsrv.so
-extension=pdo_sqlsrv.so

redis/Dockerfile

@@ -2,10 +2,13 @@ FROM redis:latest
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+## For security settings uncomment, make the dir, copy conf, and also start with the conf, to use it
+#RUN mkdir -p /usr/local/etc/redis
 #COPY redis.conf /usr/local/etc/redis/redis.conf
 
 VOLUME /data
 
 EXPOSE 6379
 
+#CMD ["redis-server", "/usr/local/etc/redis/redis.conf"]
 CMD ["redis-server"]

travis-build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #### halt script on error
-set -e
+set -xe
 
 echo '##### Print docker version'
 docker --version

workspace/Dockerfile-56

@@ -117,13 +117,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 USER root
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 #####################################
 # xDebug:
@@ -186,7 +190,8 @@ ENV INSTALL_MONGO ${INSTALL_MONGO}
 RUN if [ ${INSTALL_MONGO} = true ]; then \
     # Install the mongodb extension
     pecl install mongodb && \
-    echo "extension=mongodb.so" >> /etc/php/5.6/cli/conf.d/30-mongodb.ini \
+    echo "extension=mongodb.so" >> /etc/php/5.6/mods-available/mongodb.ini && \
+    ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \
 ;fi
 
 #####################################
@@ -333,6 +338,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=true
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+    echo "" >> ~/.bashrc && \
+    echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+    && composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################
@@ -378,6 +400,17 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
     echo 'export LD_LIBRARY_PATH="$LINUXBREWHOME/lib64:$LINUXBREWHOME/lib:$LD_LIBRARY_PATH"' >> ~/.bashrc \
 ;fi
 
+#####################################
+# SQL SERVER:
+#####################################
+ARG INSTALL_MSSQL=false
+ENV INSTALL_MSSQL ${INSTALL_MSSQL}
+
+RUN if [ ${INSTALL_MSSQL} = true ]; then \
+    apt-get -y install php5.6-sybase freetds-bin freetds-common libsybdb5 \
+    && echo "extension=pdo_dblib.so" > /etc/php/5.6/cli/conf.d/20-pdo_dblib.ini \
+;fi
+
 #####################################
 # Minio:
 #####################################

workspace/Dockerfile-70

@@ -117,13 +117,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 USER root
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 #####################################
 # xDebug:
@@ -186,7 +190,8 @@ ENV INSTALL_MONGO ${INSTALL_MONGO}
 RUN if [ ${INSTALL_MONGO} = true ]; then \
     # Install the mongodb extension
     pecl install mongodb && \
-    echo "extension=mongodb.so" >> /etc/php/7.0/cli/conf.d/30-mongodb.ini \
+    echo "extension=mongodb.so" >> /etc/php/7.0/mods-available/mongodb.ini && \
+    ln -s /etc/php/7.0/mods-available/mongodb.ini /etc/php/7.0/cli/conf.d/30-mongodb.ini \
 ;fi
 
 #####################################
@@ -350,6 +355,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=true
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+	echo "" >> ~/.bashrc && \
+	echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+	&& composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################

workspace/Dockerfile-71

@@ -113,13 +113,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 USER root
 RUN echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
-    echo "" >> ~/.bashrc
+	echo "" >> ~/.bashrc && \
+	sed -i 's/\r//' /home/laradock/aliases.sh && \
+	sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
 
 #####################################
 # xDebug:
@@ -182,7 +186,8 @@ ENV INSTALL_MONGO ${INSTALL_MONGO}
 RUN if [ ${INSTALL_MONGO} = true ]; then \
     # Install the mongodb extension
     pecl install mongodb && \
-    echo "extension=mongodb.so" >> /etc/php/7.1/cli/conf.d/30-mongodb.ini \
+    echo "extension=mongodb.so" >> /etc/php/7.1/mods-available/mongodb.ini && \
+    ln -s /etc/php/7.1/mods-available/mongodb.ini /etc/php/7.1/cli/conf.d/30-mongodb.ini \
 ;fi
 
 #####################################
@@ -342,7 +347,7 @@ RUN echo "" >> ~/.bashrc && \
 #####################################
 USER laradock
 
-ARG INSTALL_LARAVEL_ENVOY=true
+ARG INSTALL_LARAVEL_ENVOY=false
 ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY}
 
 RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
@@ -350,6 +355,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=false
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+	echo "" >> ~/.bashrc && \
+	echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+	&& composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################
@@ -368,7 +390,7 @@ RUN if [ ${INSTALL_DEPLOYER} = true ]; then \
 #####################################
 USER root
 
-ARG INSTALL_LINUXBREW=true
+ARG INSTALL_LINUXBREW=false
 ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
 
 RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
@@ -398,7 +420,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
 #####################################
 # SQL SERVER:
 #####################################
-ARG INSTALL_MSSQL=true
+ARG INSTALL_MSSQL=false
 ENV INSTALL_MSSQL ${INSTALL_MSSQL}
 
 RUN if [ ${INSTALL_MSSQL} = true ]; then \