diff --git a/docker-compose.yml b/docker-compose.yml index 94820ca6..4b021273 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -141,8 +141,8 @@ services: ## ## Mount remote MySQL socket file to local disk ## - #- MOUNT_MYSQL_SOCKET_TO_LOCALDISK=1 - #- MYSQL_SOCKET_PATH=/tmp/mysql/mysqld.sock + - MOUNT_MYSQL_SOCKET_TO_LOCALDISK=1 + - MYSQL_SOCKET_PATH=/tmp/mysql/mysqld.sock ## ## Map remote PostgreSQL Port to 127.0.0.1 @@ -180,7 +180,7 @@ services: - ${DEVILBOX_PATH}/log/${PHP_SERVER}:/var/log/php-fpm # Mount MySQL Socket directory - #- ${DEVILBOX_PATH}/run/mysql:/tmp/mysql + - ${DEVILBOX_PATH}/run/mysql:/tmp/mysql # Mount Mail directory - ${DEVILBOX_PATH}/run/mail:/var/mail @@ -224,7 +224,7 @@ services: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - #- MYSQL_SOCKET_DIR=/tmp/mysql + - MYSQL_SOCKET_DIR=/tmp/mysql # Runtime settings - MYSQL_GENERAL_LOG=${MYSQL_GENERAL_LOG} @@ -245,7 +245,7 @@ services: - ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql # Mount MySQL Socket directory - #- ${DEVILBOX_PATH}/run/mysql:/tmp/mysql + - ${DEVILBOX_PATH}/run/mysql:/tmp/mysql # Mount devilbox user-defined cnf files in order # to overwrite the MySQL server configuration diff --git a/env-example b/env-example index c63bb27a..d12dba91 100644 --- a/env-example +++ b/env-example @@ -63,8 +63,8 @@ LOCAL_LISTEN_ADDR=127.0.0.1: ### 1.1 Choose HTTP Server Image ### #HTTPD_SERVER=apache-2.2 -#HTTPD_SERVER=apache-2.4 -HTTPD_SERVER=nginx-stable +HTTPD_SERVER=apache-2.4 +#HTTPD_SERVER=nginx-stable #HTTPD_SERVER=nginx-mainline ### @@ -72,10 +72,10 @@ HTTPD_SERVER=nginx-stable ### #MYSQL_SERVER=mysql-5.5 #MYSQL_SERVER=mysql-5.6 -MYSQL_SERVER=mysql-5.7 +#MYSQL_SERVER=mysql-5.7 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 -#MYSQL_SERVER=mariadb-10.1 +MYSQL_SERVER=mariadb-10.1 #MYSQL_SERVER=mariadb-10.2 ### @@ -93,8 +93,8 @@ POSTGRES_SERVER=9.6 ### #PHP_SERVER=php-fpm-5.4 #PHP_SERVER=php-fpm-5.5 -PHP_SERVER=php-fpm-5.6 -#PHP_SERVER=php-fpm-7.0 +#PHP_SERVER=php-fpm-5.6 +PHP_SERVER=php-fpm-7.0 #PHP_SERVER=php-fpm-7.1 #PHP_SERVER=hhvm-3