Merge pull request #992 from zuohuadong/patch-3

git key to pull code
upgrade caddy to 0.10.3 version (#994 )
2017-06-07 09:42:47 +03:00 · 2017-06-04 07:29:13 -05:00 · 2017-06-04 12:15:36 +02:00 · 2017-06-02 23:54:37 -05:00 · 2017-06-02 13:53:13 +08:00 · 2017-05-31 13:41:30 +08:00
12 changed files with 134 additions and 11 deletions
--- a/README.md
+++ b/README.md
@ -25,6 +25,7 @@ A Docker PHP development environment that facilitates running **PHP** Apps on **
 - [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
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@ -2,13 +2,13 @@ FROM alpine:3.4

 MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>

-ENV caddy_version=0.10.0
+ENV caddy_version=0.10.3

 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 - \
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -481,6 +481,19 @@ services:
        - frontend
        - backend

+
+### Kibana Container #######################################
+
+    kibana:
+      build: ./kibana
+      ports:
+        - "${KIBANA_HTTP_PORT}:5601"
+      depends_on:
+        - elasticsearch
+      networks:
+        - frontend
+        - backend
+
 ### Certbot Container ##################################

    certbot:
@ -567,6 +580,7 @@ services:
        - proxy2

 ### Jenkins ###################################################
+
    jenkins:
      build: ./jenkins
      environment:
@ -582,6 +596,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 ############################################

--- a/8
+++ b/8
@ -137,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
@ -241,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 .................................

--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@ -0,0 +1,3 @@
+FROM kibana:latest
+
+EXPOSE 5601
--- a/laravel-echo-server/Dockerfile
+++ b/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" ]
--- a/laravel-echo-server/laravel-echo-server.json
+++ b/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": ""
+}
--- a/laravel-echo-server/package.json
+++ b/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"
+  }
+}
--- a/php-fpm/Dockerfile-56
+++ b/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
--- a/workspace/Dockerfile-56
+++ b/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

 #####################################
@ -395,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:
 #####################################
--- a/workspace/Dockerfile-70
+++ b/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

 #####################################
--- a/workspace/Dockerfile-71
+++ b/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

 #####################################
Author	SHA1	Message	Date
Mahmoud Zalt	26ee54a4ad	Merge pull request #992 from zuohuadong/patch-3 git key to pull code	2017-06-07 09:42:47 +03:00
Bo-Yi Wu	7207ccbbeb	upgrade caddy to 0.10.3 version (#994 )	2017-06-04 07:29:13 -05:00
Winfried	6e09e2a774	Merge pull request #964 from MyController/php56mssql Dockerfile-56 fill missing MSSQL section	2017-06-04 12:15:36 +02:00
Mark Davidson	0561199914	Add Kibana Container (#993 ) * Add Kibana Container * Add Kibana Port to env-example	2017-06-02 23:54:37 -05:00
zuohuadong	430a5f21cf	git key to pull code git key to pull code	2017-06-02 13:53:13 +08:00
mycontroller	0290142bf4	Dockerfile-56 fill missing MSSQL section	2017-05-31 13:41:30 +08:00
MyController	5745a50d15	Merge pull request #1 from laradock/master 跟进主干	2017-05-31 13:39:13 +08:00
Mahmoud Zalt	18b6c1b907	Merge pull request #984 from Obscuresounds/workspace-fix-bash-command-not-found Exec issue with workspace bugfix	2017-05-30 17:51:05 +03:00
Mahmoud Zalt	4a663649c0	Merge pull request #983 from cre8/master Add laravel echo server	2017-05-30 17:50:08 +03:00
Mahmoud Zalt	7c9d7a6de6	Merge pull request #965 from aven-li/master fix mongodb php extension config	2017-05-30 17:49:33 +03:00
Mahmoud Zalt	d0e5d50712	Update readme	2017-05-30 17:41:11 +03:00
Mirko	da60b32a04	add laravel echo server	2017-05-27 15:24:50 +02:00
Lawrence Eldridge	5a47080859	This issue relates to https://github.com/laradock/laradock/issues/563 , which also occurs on Mac. This has been one of the solutions proposed.	2017-05-27 14:07:45 +01:00
avenli	9e81f92d58	fix mongodb php extension config	2017-05-24 14:47:12 +08:00