Merge pull request #662 from zeroc0d3/master

Fixing environment in docker-compose file

.editorconfig

@@ -9,4 +9,4 @@ charset = utf-8
 
 [{Dockerfile,docker-compose.yml}]
 indent_style = space
-indent_size = 4
+indent_size = 2

.gitignore

@@ -2,3 +2,4 @@
 /logs
 /data
 .env
+/.project

DOCUMENTATION/_settings/content/getting-started/index.md

@@ -82,6 +82,7 @@ Your folder structure should look like this:
 *Or you can keep `default.conf` as it is, and create a separate config `my-site.conf` file for it.*
 
 **In case of Apache:** :P 
+
 <br>
 
 

docker-compose.yml

@@ -32,7 +32,7 @@ services:
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
           - NODE_VERSION=${WORKSPACE_NODE_VERSION}
-                - YARN_VERSION=${WORKSPACE_YARN_VERSION}
+          - YARN_VERSION=${WORKSPACE_TIMEZONE}
           - TZ=${WORKSPACE_TIMEZONE}
       volumes_from:
         - applications
@@ -112,8 +112,6 @@ services:
       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"
@@ -140,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 #########################################
 
@@ -167,10 +165,10 @@ services:
       ports:
         - "${MARIADB_PORT}:3306"
       environment:
-            MYSQL_DATABASE: ${MARIADB_DATABASE}
+        - MYSQL_DATABASE=${MARIADB_DATABASE}
-            MYSQL_USER: ${MARIADB_USER}
+        - MYSQL_USER=${MARIADB_USER}
-            MYSQL_PASSWORD: ${MARIADB_PASSWORD}
+        - MYSQL_PASSWORD=${MARIADB_PASSWORD}
-            MYSQL_ROOT_PASSWORD: ${MARIADB_PORT}
+        - MYSQL_ROOT_PASSWORD=${MARIADB_PORT}
 
 ### PostgreSQL Container ####################################
 
@@ -181,9 +179,9 @@ services:
       ports:
         - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: ${POSTGRES_DB}
+        - POSTGRES_DB=${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
+        - POSTGRES_USER=${POSTGRES_USER}
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
 
 ### PostgreSQL PostGis Container ############################
 
@@ -194,9 +192,9 @@ services:
       ports:
         - "${POSTGRES_PORT}:5432"
       environment:
-            POSTGRES_DB: ${POSTGRES_DB}
+        - POSTGRES_DB=${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
+        - POSTGRES_USER=${POSTGRES_USER}
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
 
 ### Neo4j Container #########################################
 
@@ -251,7 +249,6 @@ services:
         - "3002:3002"
         - "3003:3003"
 
-
 ### Memcached Container #####################################
 
     memcached:
@@ -283,8 +280,8 @@ services:
         - "${RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT}:15671"
       privileged: true
       environment:
-            RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER}
+        - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
-            RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS}
+        - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
       depends_on:
         - php-fpm
 
@@ -319,10 +316,10 @@ services:
     phpmyadmin:
       build: ./phpmyadmin
       environment:
-            PMA_ARBITRARY: 1
+        - PMA_ARBITRARY=1
-            MYSQL_USER: ${PMA_USER}
+        - MYSQL_USER=${PMA_USER}
-            MYSQL_PASSWORD: ${PMA_PASSWORD}
+        - MYSQL_PASSWORD=${PMA_PASSWORD}
-            MYSQL_ROOT_PASSWORD: ${PMA_ROOT_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${PMA_ROOT_PASSWORD}
       ports:
         - "${PMA_PORT}:80"
       depends_on:
@@ -359,8 +356,8 @@ services:
         - ./data/certbot/certs/:/var/certs
         - ./certbot/letsencrypt/:/var/www/letsencrypt
       environment:
-            CN: "fake.domain.com"
+        - CN="fake.domain.com"
-            EMAIL: "fake.email@gmail.com"
+        - EMAIL="fake.email@gmail.com"
 
 ### Mailhog Container #########################################
 

docs/getting-started/index.xml

@@ -217,6 +217,7 @@
 
 <p><br>
 5 - Open your browser and visit your localhost address <code>http://localhost/</code>. If you followed the multiple projects setup, you can visit <code>http://project-1.dev/</code> and <code>http://project-2.dev/</code>. But first don’t</p>
+
 </description>
     </item>
     

docs/index.html

@@ -1949,7 +1949,6 @@ These Docker Compose projects have piqued our interest:</li>
 <h2 id="i-have-a-question-problem">I have a Question/Problem</h2>
 
 <p>If you have questions about how to use Laradock, please direct your questions to the discussion on <a href="https://gitter.im/Laradock/laradock">Gitter</a>. If you believe your question could help others, then consider opening an <a href="https://github.com/laradock/laradock/issues">Issue</a> (it will be labeled as <code>Question</code>) And you can still seek help on Gitter for it.</p>
-
 <h2 id="i-found-an-issue">I found an Issue</h2>
 
 <p>If have an issue or you found a typo in the documentation, you can help us by

docs/index.xml

@@ -1713,7 +1713,6 @@ features, by not reporting duplicate issues.</em></p>
 <h3 id="to-host-the-website-locally">To Host the website locally</h3>
 
 <p>Go to <code>DOCUMENTATION/_settings</code> in your terminal and run <code>hugo serve</code> to host the website locally.</p>
-
 <h3 id="edit-the-sidebar">Edit the sidebar</h3>
 
 <p>To add a new section to the sidebar or edit existing one, you need to edit this file <code>DOCUMENTATION/_settings/config.toml</code>.</p>