Merge pull request #1466 from fenech/master

Add missing syntax to continue line

DOCUMENTATION/content/getting-started/index.md

@@ -176,7 +176,7 @@ docker-compose up -d nginx mysql
 **Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`.
 
 
-You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images).
+You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images).
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 

aerospike/Dockerfile

@@ -4,4 +4,4 @@ LABEL maintainer="Luciano Jr <luciano@lucianojr.com.br>"
 
 RUN rm /etc/aerospike/aerospike.conf
 
-ADD aerospike.conf /etc/aerospike/aerospike.conf
+COPY aerospike.conf /etc/aerospike/aerospike.conf

docker-compose.dev.yml

@@ -6,4 +6,4 @@ services:
 
     applications:
       volumes:
-        - ${APPLICATION}:/var/www
+        - ${APPLICATION}:/var/www:cached

docker-compose.yml

@@ -62,6 +62,8 @@ services:
       ports:
         - "${WORKSPACE_SSH_PORT}:22"
       tty: true
+      environment:
+        - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
       networks:
         - frontend
         - backend
@@ -123,6 +125,8 @@ services:
           - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
       volumes_from:
         - applications
+      volumes:
+        - ./php-worker/supervisord.d:/etc/supervisord.d
       depends_on:
         - workspace
       extra_hosts:
@@ -508,7 +512,6 @@ services:
       build: ./elasticsearch
       volumes:
         - elasticsearch-data:/usr/share/elasticsearch/data
-        - elasticsearch-plugins:/usr/share/elasticsearch/plugins
       environment:
         - cluster.name=laradock-cluster
         - bootstrap.memory_lock=true
@@ -748,5 +751,3 @@ volumes:
     driver: "local"
   elasticsearch-data:
     driver: "local"
-  elasticsearch-plugins:
-    driver: "local"

elasticsearch/Dockerfile

@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.3
 
 EXPOSE 9200 9300

hhvm/Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update -y \
 
 RUN mkdir -p /var/www
 
-ADD server.ini /etc/hhvm/server.ini
+COPY server.ini /etc/hhvm/server.ini
 
 RUN usermod -u 1000 www-data
 

mariadb/Dockerfile

@@ -2,7 +2,7 @@ FROM mariadb:latest
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
-ADD my.cnf /etc/mysql/conf.d/my.cnf
+COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 CMD ["mysqld"]
 

mysql/Dockerfile

@@ -13,7 +13,7 @@ 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
+COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 CMD ["mysqld"]
 

nginx/Dockerfile

@@ -2,7 +2,7 @@ FROM nginx:alpine
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
-ADD nginx.conf /etc/nginx/
+COPY nginx.conf /etc/nginx/
 
 # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
 

nginx/sites/symfony.conf.example

@@ -11,11 +11,17 @@ server {
       try_files $uri @rewriteapp;
     }
 
+    # For Symfony 3
     location @rewriteapp {
         rewrite ^(.*)$ /app.php/$1 last;
     }
     
-    location ~ ^/(app|app_dev|config)\.php(/|$) {
+    # For Symfony 4 config
+    # location @rewriteapp {
+    #     rewrite ^(.*)$ /index.php/$1 last;
+    # }
+
+    location ~ ^/(app|app_dev|config|index)\.php(/|$) {
         fastcgi_pass php-upstream;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;

percona/Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="DTUNES <diegotdai@gmai.com>"
 
 RUN chown -R mysql:root /var/lib/mysql/
 
-ADD my.cnf /etc/mysql/conf.d/my.cnf
+COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 CMD ["mysqld"]
 

php-fpm/Dockerfile-56

@@ -358,8 +358,8 @@ RUN php -v | head -n 1 | grep -q "PHP 5.6."
 #--------------------------------------------------------------------------
 #
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d
+COPY ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
 
 #RUN rm -r /var/lib/apt/lists/*
 

php-fpm/Dockerfile-70

@@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.0."
 #--------------------------------------------------------------------------
 #
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d/
+COPY ./laravel.ini /usr/local/etc/php/conf.d/
-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
 
 #RUN rm -r /var/lib/apt/lists/*
 

php-fpm/Dockerfile-71

@@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.1."
 #--------------------------------------------------------------------------
 #
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d
+COPY ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
 
 #RUN rm -r /var/lib/apt/lists/*
 

php-fpm/Dockerfile-72

@@ -383,8 +383,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.2."
 #--------------------------------------------------------------------------
 #
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d
+COPY ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
 
 #RUN rm -r /var/lib/apt/lists/*
 

php-worker/supervisord.conf

@@ -6,10 +6,5 @@ port = 127.0.0.1:9001
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
-[program:laravel-worker]
+[include]
-process_name=%(program_name)s_%(process_num)02d
+files = supervisord.d/*.conf
-command=php /var/www/artisan queue:work --sleep=3 --tries=3 --daemon
-autostart=true
-autorestart=true
-numprocs=8
-redirect_stderr=true

php-worker/supervisord.d/laravel-worker.conf

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

varnish/Dockerfile

@@ -19,8 +19,8 @@ ENV VARNISH_PORT    6081
 ENV BACKEND_HOST    localhost
 ENV BACKEND_PORT    80
 
-ADD default.vcl /etc/varnish/default.vcl
+COPY default.vcl /etc/varnish/default.vcl
-ADD start.sh /etc/varnish/start.sh
+COPY start.sh /etc/varnish/start.sh
 
 RUN chmod +x /etc/varnish/start.sh
 

workspace/Dockerfile-56

@@ -54,9 +54,8 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
+    useradd -u ${PUID} -g laradock -m laradock -G docker_env && \
-    usermod -p "*" laradock && \
+    usermod -p "*" laradock
-    apt-get update -yqq
 
 #####################################
 # SOAP:
@@ -209,8 +208,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
 ARG INSTALL_WORKSPACE_SSH=false
 ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
 
-ADD insecure_id_rsa /tmp/id_rsa
+COPY insecure_id_rsa /tmp/id_rsa
-ADD insecure_id_rsa.pub /tmp/id_rsa.pub
+COPY insecure_id_rsa.pub /tmp/id_rsa.pub
 
 RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
     rm -f /etc/service/sshd/down && \

workspace/Dockerfile-70

@@ -54,9 +54,8 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
+    useradd -u ${PUID} -g laradock -m laradock -G docker_env && \
-    usermod -p "*" laradock && \
+    usermod -p "*" laradock
-    apt-get update -yqq
 
 #####################################
 # SOAP:
@@ -206,8 +205,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
 ARG INSTALL_WORKSPACE_SSH=false
 ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
 
-ADD insecure_id_rsa /tmp/id_rsa
+COPY insecure_id_rsa /tmp/id_rsa
-ADD insecure_id_rsa.pub /tmp/id_rsa.pub
+COPY insecure_id_rsa.pub /tmp/id_rsa.pub
 
 RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
     rm -f /etc/service/sshd/down && \

workspace/Dockerfile-71

@@ -54,7 +54,7 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
+    useradd -u ${PUID} -g laradock -m laradock -G docker_env && \
     usermod -p "*" laradock
 
 #####################################
@@ -202,8 +202,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
 ARG INSTALL_WORKSPACE_SSH=false
 ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
 
-ADD insecure_id_rsa /tmp/id_rsa
+COPY insecure_id_rsa /tmp/id_rsa
-ADD insecure_id_rsa.pub /tmp/id_rsa.pub
+COPY insecure_id_rsa.pub /tmp/id_rsa.pub
 
 RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
     rm -f /etc/service/sshd/down && \

workspace/Dockerfile-72

@@ -54,10 +54,9 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
+    useradd -u ${PUID} -g laradock -m laradock -G docker_env && \
     usermod -p "*" laradock
 
-
 #####################################
 # SOAP:
 #####################################
@@ -203,8 +202,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
 ARG INSTALL_WORKSPACE_SSH=false
 ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
 
-ADD insecure_id_rsa /tmp/id_rsa
+COPY insecure_id_rsa /tmp/id_rsa
-ADD insecure_id_rsa.pub /tmp/id_rsa.pub
+COPY insecure_id_rsa.pub /tmp/id_rsa.pub
 
 RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
     rm -f /etc/service/sshd/down && \