Merge branch 'master' into master

apache2/Dockerfile

@@ -12,6 +12,8 @@ EXPOSE 80 443
 
 WORKDIR /var/www/
 
+ADD vhost.conf /etc/apache2/sites-enabled/vhost.conf
+
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
 CMD ["supervisord"]

apache2/sites/.gitignore

@@ -0,0 +1,3 @@
+*.conf
+!default.conf
+!default.apache.conf

apache2/sites/default.apache.conf

@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+  ServerName laradock.dev
+  DocumentRoot /var/www/html/
+  Options Indexes FollowSymLinks
+
+  <Directory "/var/www/html/">
+    AllowOverride All
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </Directory>
+
+</VirtualHost>

apache2/sites/sample.conf.example

@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+  ServerName sample.dev
+  DocumentRoot /var/www/sample/public/
+  Options Indexes FollowSymLinks
+
+  <Directory "/var/www/sample/public/">
+    AllowOverride All
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </Directory>
+
+</VirtualHost>

apache2/vhost.conf

@@ -0,0 +1 @@
+Include /etc/apache2/sites-available/*.conf

docker-compose.yml

@@ -73,6 +73,15 @@ services:
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
             
+### PHP Worker Container #####################################
+    php-worker:
+      build:
+        context: ./php-worker
+      volumes_from:
+        - applications
+      depends_on:
+        - workspace
+
 ### Nginx Server Container ##################################
 
     nginx:
@@ -102,6 +111,7 @@ services:
         - applications
       volumes:
         - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
+        - ./apache2/sites:/etc/apache2/sites-available
       ports:
         - "${APACHE_HOST_HTTP_PORT}:80"
         - "${APACHE_HOST_HTTPS_PORT}:443"
@@ -128,8 +138,8 @@ services:
       ports:
         - "${MINIO_PORT}:9000"
       environment:
-        MINIO_ACCESS_KEY: access
+        - MINIO_ACCESS_KEY=access
-        MINIO_SECRET_KEY: secretkey
+        - MINIO_SECRET_KEY=secretkey
 
 ### MySQL Container #########################################
 

env-example

@@ -50,7 +50,7 @@ PHP_FPM_INSTALL_INTL=false
 
 ### NGINX Container
 NGINX_HOST_HTTP_PORT=80
-NGINX_HOST_HTTPS_PORT=433
+NGINX_HOST_HTTPS_PORT=443
 NGINX_HOST_LOG_PATH=./logs/nginx/
 NGINX_SITES_PATH=./nginx/sites/
 

nginx/sites/.gitignore

@@ -0,0 +1,2 @@
+*.conf
+!default.conf

php-fpm/Dockerfile-71

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #
 
-FROM laradock/php-fpm:7.1--0.0 # placeholder. Need change after new image would be built.
+FROM laradock/php-fpm:7.1--1.3
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -140,6 +140,32 @@ RUN if [ ${CODEIGNITER} = true ]; then \
      docker-php-ext-install tokenizer \
 ;fi
 
+#####################################
+# Human Language and Character Encoding Support:
+#####################################
+
+ARG INTL=false
+RUN if [ ${INTL} = true ]; then \
+    # Install intl and requirements
+    apt-get install -y zlib1g-dev libicu-dev g++ && \
+    docker-php-ext-configure intl && \
+    docker-php-ext-install intl \
+;fi
+
+#####################################
+# GHOSTSCRIPT:
+#####################################
+
+ARG GHOSTSCRIPT=false
+RUN if [ ${GHOSTSCRIPT} = true ]; then \
+    # Install the ghostscript extension
+    # for PDF editing
+    apt-get -y update \
+    && apt-get install -y \
+    poppler-utils \
+    ghostscript \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-worker/Dockerfile

@@ -0,0 +1,39 @@
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To take a look at the'php-worker' base Image, visit its DockerHub page
+#    https://hub.docker.com/r/nielsvdoorn/laravel-supervisor/
+#
+
+FROM nielsvdoorn/laravel-supervisor
+
+#
+#--------------------------------------------------------------------------
+# Optional Supervisord Configuration
+#--------------------------------------------------------------------------
+#
+# Modify the ./supervisor.conf file to match your App's requirements.
+# Make sure you rebuild your container with every change.
+#
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# If you need to modify this image, feel free to do it right here.
+#
+	# -- Your awesome modifications go here -- #
+
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
+RUN rm -r /var/lib/apt/lists/*
+WORKDIR /etc/supervisor/conf.d/

php-worker/supervisord.conf

@@ -0,0 +1,9 @@
+[supervisord]
+nodaemon=true
+[program:laravel-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/laravel/artisan queue:work --sleep=3 --tries=3 --daemon
+autostart=true
+autorestart=true
+numprocs=8
+redirect_stderr=true