Merge pull request #1345 from jdxia/master

workspace container adds swoole

.github/README.md

@@ -35,11 +35,6 @@ Support this project by becoming a sponsor.
 
 Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
 
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
-</a>
-
-
 <a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
 <a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
 <a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>

.gitignore

@@ -4,3 +4,4 @@
 .env
 /.project
 .docker-sync
+/jenkins/jenkins_home

.travis.yml

@@ -35,7 +35,7 @@ env:
 
     - PHP_VERSION=NA BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
     - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
-    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 haproxy"
     - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"
     # - PHP_VERSION=NA BUILD_SERVICE="aws"
 

DOCUMENTATION/content/documentation/index.md

@@ -431,15 +431,35 @@ To learn more about how Docker publishes ports, please read [this excellent post
 
 
 
+<br>
+<a name="Use-Jenkins"></a>
+## Use Jenkins
+
+1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`.
+
+2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping) 
+
+3) Authenticate from the web app.
+
+- Default username is `admin`.
+- Default password is `docker-compose exec jenkins cat /var/jenkins_home/secrets/initialAdminPassword`. 
+
+(To enter container as root type `docker-compose exec --user root jenkins bash`).
+
+4) Install some plugins.
+
+5) Create your first Admin user, or continue as Admin.
+
+Note: to add user go to `http://localhost:8090/securityRealm/addUser` and to restart it from the web app visit `http://localhost:8090/restart`.
+
+You may wanna change the default security configuration, so go to `http://localhost:8090/configureSecurity/` under Authorization and choosing "Anyone can do anything" or "Project-based Matrix Authorization Strategy" or anything else.
+
+
+
 
 <br>
 <a name="Laravel"></a>
 
-
-
-
-
-
 <a name="Install-Laravel"></a>
 ## Install Laravel from a Docker Container
 
@@ -1074,9 +1094,6 @@ To change the default forwarded port for ssh:
 
 
 
-
-
-
 <br>
 <a name="Change-the-MySQL-Version"></a>
 ## Change the (MySQL) Version

DOCUMENTATION/content/introduction/index.md

@@ -137,11 +137,6 @@ Your logo will show up on the [github repository](https://github.com/laradock/la
 <a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
 
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
-</a>
-
-
 
 
 <a name="what-is-docker"></a>

DOCUMENTATION/content/related-projects/index.md

@@ -14,5 +14,6 @@ These Docker Compose projects have piqued our interest:
 * [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
 * [RubyDev-Dock](https://github.com/scudelletti/rubydev-dock) by [Diogo Scudelletti](https://github.com/scudelletti)
 * [NoDock](https://github.com/Osedea/nodock) by [Osedea](https://github.com/Osedea)
+* [Dockery](https://github.com/taufek/dockery) by [Taufek](https://github.com/Taufek)
 
 If you want your project listed here, please open an issue.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2016 <Mahmoud Zalt>
+Copyright 2018 <Mahmoud Zalt>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

caddy/Caddyfile

@@ -25,6 +25,22 @@
     #  dns cloudflare
     #}
 }
-laradock.demo:80 {
+
+laradock1.demo:80 {
     root /var/www/public
+    # Create a Webhook in git.
+    #git {
+	#repo https://github.com/xxx/xxx
+    #    path /home/xxx
+    #    #interval 60
+    #    hook  webhook laradock
+    #    hook_type   generic
+    #}
+
+}
+
+laradock2.demo:80 {
+    # Create a Proxy and cors.
+    #proxy domain.com
+	#cors
 }

docker-compose.yml

@@ -19,6 +19,7 @@ services:
           - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
           - INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP}
           - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
+          - INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP}
           - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
           - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
           - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
@@ -41,6 +42,7 @@ services:
           - INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM}
           - INSTALL_DUSK_DEPS=${WORKSPACE_INSTALL_DUSK_DEPS}
           - INSTALL_PG_CLIENT=${WORKSPACE_INSTALL_PG_CLIENT}
+          - INSTALL_SWOOLE=${WORKSPACE_INSTALL_SWOOLE}
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
           - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
@@ -71,9 +73,11 @@ services:
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
           - INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
           - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
+          - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
           - INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
           - INSTALL_ZIP_ARCHIVE=${PHP_FPM_INSTALL_ZIP_ARCHIVE}
           - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
+          - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
           - INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
           - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
           - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
@@ -286,7 +290,7 @@ services:
     postgres:
       build: ./postgres
       volumes:
-        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
+        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql
       ports:
         - "${POSTGRES_PORT}:5432"
       environment:
@@ -503,12 +507,12 @@ services:
       environment:
         - cluster.name=laradock-cluster
         - bootstrap.memory_lock=true
-        - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+        - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       ulimits:
         memlock:
           soft: -1
           hard: -1
-      mem_limit: 512m
+      mem_limit: 1024m
       ports:
         - "${ELASTICSEARCH_HOST_HTTP_PORT}:9200"
         - "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"
@@ -616,9 +620,9 @@ services:
       networks:
         - frontend
 
-### Balancer Haproxy ##########################################
+### HAProxy Load Balancer ####################################
 
-    balancer:
+    haproxy:
       build: ./haproxy
       ports:
         - "${HAPROXY_HOST_HTTP_PORT}:8085"

env-example

@@ -63,6 +63,7 @@ WORKSPACE_INSTALL_LDAP=false
 WORKSPACE_INSTALL_SOAP=false
 WORKSPACE_INSTALL_IMAP=false
 WORKSPACE_INSTALL_MONGO=false
+WORKSPACE_INSTALL_AMQP=false
 WORKSPACE_INSTALL_PHPREDIS=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_NODE=false
@@ -85,6 +86,7 @@ WORKSPACE_INSTALL_IMAGEMAGICK=false
 WORKSPACE_INSTALL_TERRAFORM=false
 WORKSPACE_INSTALL_DUSK_DEPS=false
 WORKSPACE_INSTALL_PG_CLIENT=false
+WORKSPACE_INSTALL_SWOOLE=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_CHROME_DRIVER_VERSION=2.32
@@ -97,10 +99,12 @@ WORKSPACE_SSH_PORT=2222
 
 PHP_FPM_INSTALL_XDEBUG=false
 PHP_FPM_INSTALL_MONGO=false
+PHP_FPM_INSTALL_AMQP=false
 PHP_FPM_INSTALL_MSSQL=false
 PHP_FPM_INSTALL_SOAP=false
 PHP_FPM_INSTALL_ZIP_ARCHIVE=false
 PHP_FPM_INSTALL_BCMATH=false
+PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_PHPREDIS=false
 PHP_FPM_INSTALL_MEMCACHED=false
 PHP_FPM_INSTALL_OPCACHE=false

jenkins/Dockerfile

@@ -36,10 +36,12 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
 
 # jenkins version being bundled in this docker image
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2}
 
 # jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3
+# 2.89.2
+ARG JENKINS_SHA=014f669f32bc6e925e926e260503670b32662f006799b133a031a70a794c8a14
+
 
 # Can be used to customize where jenkins.war get downloaded from
 ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war

nginx/Dockerfile

@@ -9,7 +9,7 @@ ADD nginx.conf /etc/nginx/
 ARG CHANGE_SOURCE=false
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
     # Change application source from dl-cdn.alpinelinux.org to aliyun source
-    RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
 ;fi
 
 RUN apk update \

php-fpm/Dockerfile-56

@@ -136,6 +136,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     docker-php-ext-enable mongodb \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+ARG INSTALL_AMQP=false
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get update && \
+    apt-get install librabbitmq-dev -y && \
+    # Install the amqp extension
+    pecl install amqp && \
+    docker-php-ext-enable amqp \
+;fi
+
 #####################################
 # ZipArchive:
 #####################################
@@ -156,6 +169,18 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
     docker-php-ext-install bcmath \
 ;fi
 
+#####################################
+# GMP (GNU Multiple Precision):
+#####################################
+
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+    # Install the GMP extension
+	apt-get update -yqq && \
+	apt-get install -y libgmp-dev && \ 
+    docker-php-ext-install gmp \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

php-fpm/Dockerfile-70

@@ -133,6 +133,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     docker-php-ext-enable mongodb \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+ARG INSTALL_AMQP=false
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get update && \
+    apt-get install librabbitmq-dev -y && \
+    # Install the amqp extension
+    pecl install amqp && \
+    docker-php-ext-enable amqp \
+;fi
+
 #####################################
 # ZipArchive:
 #####################################
@@ -153,6 +166,18 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
     docker-php-ext-install bcmath \
 ;fi
 
+#####################################
+# GMP (GNU Multiple Precision):
+#####################################
+
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+    # Install the GMP extension
+	apt-get update -yqq && \
+	apt-get install -y libgmp-dev && \ 
+    docker-php-ext-install gmp \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

php-fpm/Dockerfile-71

@@ -133,6 +133,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     docker-php-ext-enable mongodb \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+ARG INSTALL_AMQP=false
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get update && \
+    apt-get install librabbitmq-dev -y && \
+    # Install the amqp extension
+    pecl install amqp && \
+    docker-php-ext-enable amqp \
+;fi
+
 #####################################
 # ZipArchive:
 #####################################
@@ -153,6 +166,18 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
     docker-php-ext-install bcmath \
 ;fi
 
+#####################################
+# GMP (GNU Multiple Precision):
+#####################################
+
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+    # Install the GMP extension
+	apt-get update -yqq && \
+	apt-get install -y libgmp-dev && \ 
+    docker-php-ext-install gmp \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

php-worker/supervisord.conf

@@ -1,5 +1,11 @@
 [supervisord]
 nodaemon=true
+[supervisorctl]
+[inet_http_server]
+port = 127.0.0.1:9001
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
 [program:laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
 command=php /var/www/artisan queue:work --sleep=3 --tries=3 --daemon

workspace/Dockerfile-56

@@ -209,6 +209,8 @@ RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
         && rm -f /tmp/id_rsa* \
         && chmod 644 /root/.ssh/authorized_keys /root/.ssh/id_rsa.pub \
     && chmod 400 /root/.ssh/id_rsa \
+    && cp -rf /root/.ssh /home/laradock \
+    && chown -R laradock:laradock /home/laradock/.ssh \
 ;fi
 
 #####################################
@@ -226,6 +228,21 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+# Check if Mongo needs to be installed
+ARG INSTALL_AMQP=false
+ENV INSTALL_AMQP ${INSTALL_AMQP}
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get install librabbitmq-dev -y && \
+    # Install the mongodb extension
+    pecl -q install amqp && \
+    echo "extension=amqp.so" >> /etc/php/5.6/mods-available/amqp.ini && \
+    ln -s /etc/php/5.6/mods-available/amqp.ini /etc/php/5.6/cli/conf.d/30-amqp.ini \
+;fi
+
 #####################################
 # PHP REDIS EXTENSION FOR PHP 5.6
 #####################################
@@ -239,6 +256,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     phpenmod redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 5.6
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl -q install swoole && \
+    echo "extension=swoole.so" >> /etc/php/5.6/mods-available/swoole.ini && \
+    ln -s /etc/php/5.6/mods-available/swoole.ini /etc/php/5.6/cli/conf.d/20-swoole.ini \
+;fi
+
 #####################################
 # Drush:
 #####################################

workspace/Dockerfile-70

@@ -206,6 +206,8 @@ RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
         && rm -f /tmp/id_rsa* \
         && chmod 644 /root/.ssh/authorized_keys /root/.ssh/id_rsa.pub \
     && chmod 400 /root/.ssh/id_rsa \
+    && cp -rf /root/.ssh /home/laradock \
+    && chown -R laradock:laradock /home/laradock/.ssh \
 ;fi
 
 #####################################
@@ -222,6 +224,21 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     ln -s /etc/php/7.0/mods-available/mongodb.ini /etc/php/7.0/cli/conf.d/30-mongodb.ini \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+# Check if Mongo needs to be installed
+ARG INSTALL_AMQP=false
+ENV INSTALL_AMQP ${INSTALL_AMQP}
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get install librabbitmq-dev -y && \
+    # Install the mongodb extension
+    pecl -q install amqp && \
+    echo "extension=amqp.so" >> /etc/php/7.0/mods-available/amqp.ini && \
+    ln -s /etc/php/7.0/mods-available/amqp.ini /etc/php/7.0/cli/conf.d/30-amqp.ini \
+;fi
+
 #####################################
 # PHP REDIS EXTENSION FOR PHP 7
 #####################################
@@ -235,6 +252,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     phpenmod redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 7
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl -q install swoole && \
+    echo "extension=swoole.so" >> /etc/php/7.0/mods-available/swoole.ini && \
+    ln -s /etc/php/7.0/mods-available/swoole.ini /etc/php/7.0/cli/conf.d/20-swoole.ini \
+;fi
+
 #####################################
 # Drush:
 #####################################

workspace/Dockerfile-71

@@ -202,6 +202,8 @@ RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
         && rm -f /tmp/id_rsa* \
         && chmod 644 /root/.ssh/authorized_keys /root/.ssh/id_rsa.pub \
     && chmod 400 /root/.ssh/id_rsa \
+    && cp -rf /root/.ssh /home/laradock \
+    && chown -R laradock:laradock /home/laradock/.ssh \
 ;fi
 
 #####################################
@@ -218,6 +220,21 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     ln -s /etc/php/7.1/mods-available/mongodb.ini /etc/php/7.1/cli/conf.d/30-mongodb.ini \
 ;fi
 
+#####################################
+# AMQP:
+#####################################
+
+# Check if Mongo needs to be installed
+ARG INSTALL_AMQP=false
+ENV INSTALL_AMQP ${INSTALL_AMQP}
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+    apt-get install librabbitmq-dev -y && \
+    # Install the mongodb extension
+    pecl -q install amqp && \
+    echo "extension=amqp.so" >> /etc/php/7.1/mods-available/amqp.ini && \
+    ln -s /etc/php/7.1/mods-available/amqp.ini /etc/php/7.1/cli/conf.d/30-amqp.ini \
+;fi
+
 #####################################
 # PHP REDIS EXTENSION FOR PHP 7.1
 #####################################
@@ -231,6 +248,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     phpenmod redis \
 ;fi
 
+#####################################
+# Swoole EXTENSION FOR PHP 7
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl -q install swoole && \
+    echo "extension=swoole.so" >> /etc/php/7.1/mods-available/swoole.ini && \
+    ln -s /etc/php/7.1/mods-available/swoole.ini /etc/php/7.1/cli/conf.d/20-swoole.ini \
+;fi
+
 #####################################
 # Drush:
 #####################################