Merge pull request #1038 from vwchu/master

add APACHE_SITES_PATH variable

DOCUMENTATION/content/documentation/index.md

@@ -192,14 +192,17 @@ The NGINX Log file is stored in the `logs/nginx` directory.
 However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
 
 ```bash
-docker logs {container-name}
+docker-compose logs {container-name}
+```
+
+```bash
+docker-compose logs -f {container-name}
 ```
 
 More [options](https://docs.docker.com/compose/reference/logs/)
 
-```bash
+
-docker logs -f {container-name}
+
-```
 
 
 
@@ -1057,6 +1060,19 @@ The default username and password for the root MySQL user are `root` and `root `
 
 
 
+<br>
+<a name="Create-Multiple-Databases"></a>
+## Create Multiple Databases (MySQL)
+
+Create `createdb.sql` from `mysql/docker-entrypoint-initdb.d/createdb.sql.example` in `mysql/docker-entrypoint-initdb.d/*` and add your SQL syntax as follow:
+
+```sql
+CREATE DATABASE IF NOT EXISTS `your_db_1` COLLATE 'utf8_general_ci' ;
+GRANT ALL ON `your_db_1`.* TO 'mysql_user'@'%' ;
+```
+
+
+
 
 <br>
 <a name="Change-MySQL-port"></a>

docker-compose.yml

@@ -149,7 +149,7 @@ services:
         - applications
       volumes:
         - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
-        - ./apache2/sites:/etc/apache2/sites-available
+        - ${APACHE_SITES_PATH}:/etc/apache2/sites-available
       ports:
         - "${APACHE_HOST_HTTP_PORT}:80"
         - "${APACHE_HOST_HTTPS_PORT}:443"
@@ -473,6 +473,15 @@ services:
       volumes:
         - elasticsearch-data:/usr/share/elasticsearch/data
         - elasticsearch-plugins:/usr/share/elasticsearch/plugins
+      environment:
+        - cluster.name=laradock-cluster
+        - bootstrap.memory_lock=true
+        - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+      ulimits:
+        memlock:
+          soft: -1
+          hard: -1
+      mem_limit: 512m
       ports:
         - "${ELASTICSEARCH_HOST_HTTP_PORT}:9200"
         - "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"

env-example

@@ -85,6 +85,7 @@ APACHE_HOST_HTTP_PORT=80
 APACHE_HOST_HTTPS_PORT=443
 APACHE2_PHP_SOCKET=php-fpm:9000
 APACHE_HOST_LOG_PATH=./logs/apache2
+APACHE_SITES_PATH=./apache2/sites
 PHP_SOCKET=php-fpm:9000
 
 ### MYSQL ##############################################################################################################

mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:5.7
+FROM mysql:8.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

mysql/docker-entrypoint-initdb.d/createdb.sql.example

@@ -1,20 +1,20 @@
-###
+#
-### Copy createdb.sql.example to createdb.sql
+# Copy createdb.sql.example to createdb.sql
-### then uncomment then set database name and username to create you need databases
+# then uncomment then set database name and username to create you need databases
 #
 # example: .env MYSQL_USER=appuser and need db name is myshop_db
 #
 #    CREATE DATABASE IF NOT EXISTS `myshop_db` ;
 #    GRANT ALL ON `myshop_db`.* TO 'appuser'@'%' ;
 #
-###
+#
-### this sql script is auto run when mysql container start and $DATA_SAVE_PATH/mysql not exists.
+# this sql script will auto run when the mysql container starts and the $DATA_SAVE_PATH/mysql not found.
-###
+#
-### if your $DATA_SAVE_PATH/mysql is exists and you do not want to delete it, you can run by manual execution:
+# if your $DATA_SAVE_PATH/mysql exists and you do not want to delete it, you can run by manual execution:
-###
+#
-###     docker-compose exec mysql bash
+#     docker-compose exec mysql bash
-###     mysql -u root -p < /docker-entrypoint-initdb.d/createdb.sql
+#     mysql -u root -p < /docker-entrypoint-initdb.d/createdb.sql
-###
+#
 
 #CREATE DATABASE IF NOT EXISTS `dev_db_1` COLLATE 'utf8_general_ci' ;
 #GRANT ALL ON `dev_db_1`.* TO 'default'@'%' ;

pgadmin/Dockerfile

@@ -1,4 +1,4 @@
-FROM fenglc/pgadmin4
+FROM chorss/docker-pgadmin4
 
 MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>