Add environment variable DATA_DIR

Author: garymengcom

.gitignore

@@ -6,5 +6,4 @@ docker-compose.yml
 docker-compose.yml.*
 www/*
 !www/localhost/
-data/*
 logs/*

services/php/composer/.gitignore data/composer/.gitignore

@@ -41,7 +41,7 @@ services:
       - ${PHP_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
       - ${PHP_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
       - ${PHP_LOG_DIR}:/var/log/php
-      - ${COMPOSER_HOME}:/tmp/composer
+      - ${DATA_DIR}/composer:/tmp/composer
     restart: always
     cap_add:
       - SYS_PTRACE
@@ -64,7 +64,7 @@ services:
 #      - ${PHP56_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
 #      - ${PHP56_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
 #      - ${PHP56_LOG_DIR}:/var/log/php
-#      - ${COMPOSER56_HOME}:/tmp/composer
+#      - ${DATA_DIR}/composer:/tmp/composer
 #    restart: always
 #    cap_add:
 #      - SYS_PTRACE
@@ -85,7 +85,7 @@ services:
 #      - ${PHP54_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
 #      - ${PHP54_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
 #      - ${PHP54_LOG_DIR}:/var/log/php
-#      - ${COMPOSER54_HOME}:/tmp/composer
+#      - ${DATA_DIR}/composer:/tmp/composer
 #    restart: always
 #    cap_add:
 #      - SYS_PTRACE
@@ -99,7 +99,7 @@ services:
       - "${MYSQL_HOST_PORT}:3306"
     volumes:
       - ${MYSQL_CONF_FILE}:/etc/mysql/conf.d/mysql.cnf:ro
-      - ${MYSQL_DATA_DIR}:/var/lib/mysql/:rw
+      - ${DATA_DIR}/mysql:/var/lib/mysql/:rw
     restart: always
     networks:
       - default
@@ -114,7 +114,7 @@ services:
 #      - "${MYSQL5_HOST_PORT}:3306"
 #    volumes:
 #      - ${MYSQL5_CONF_FILE}:/etc/mysql/conf.d/mysql.cnf:ro
-#      - ${MYSQL5_DATA_DIR}:/var/lib/mysql/:rw
+#      - ${DATA_DIR}/mysql5:/var/lib/mysql/:rw
 #    restart: always
 #    networks:
 #      - default
@@ -212,7 +212,7 @@ services:
 #        MONGO_INITDB_ROOT_PASSWORD: "${MONGODB_INITDB_ROOT_PASSWORD}"
 #        TZ: "$TZ"
 #    volumes:
-#      - ${MONGODB_DATA_DIR}:/data/db:rw
+#      - ${DATA_DIR}/mongo:/data/db:rw
 #      - ${MONGODB_DATA_DIR}/mongo_key:/mongo:rw
 #    ports:
 #       - "${MONGODB_HOST_PORT}:27017"
@@ -245,7 +245,7 @@ services:
 #      - discovery.type=single-node
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 #    volumes:
-#      - ${ELASTICSEARCH_DATA_DIR}:/usr/share/elasticsearch/data
+#      - ${DATA_DIR}/esdata:/usr/share/elasticsearch/data
 #      - ${ELASTICSEARCH_CONF_FILE}:/usr/share/elasticsearch/elasticsearch.yml
 #    hostname: elasticsearch
 #    restart: always

docker-compose.sample.yml

@@ -3,6 +3,11 @@
 #
 SOURCE_DIR=./www
 
+#
+# Runtime data directory
+#
+DATA_DIR=./data
+
 #
 # Container Timezone
 #
@@ -67,7 +72,6 @@ PHP_PHP_CONF_FILE=./services/php/php.ini
 PHP_FPM_CONF_FILE=./services/php/php-fpm.conf
 PHP_LOG_DIR=./logs/php
 PHP_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
-COMPOSER_HOME=./services/php/composer
 
 #
 # PHP5.6
@@ -77,7 +81,6 @@ PHP56_PHP_CONF_FILE=./services/php/php.ini
 PHP56_FPM_CONF_FILE=./services/php/php-fpm.conf
 PHP56_LOG_DIR=./logs/php
 PHP56_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
-COMPOSER56_HOME=./services/php/composer
 
 #
 # PHP5.4
@@ -87,7 +90,6 @@ PHP54_PHP_CONF_FILE=./services/php54/php.ini
 PHP54_FPM_CONF_FILE=./services/php54/php-fpm.conf
 PHP54_LOG_DIR=./logs/php
 PHP54_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
-COMPOSER54_HOME=./services/php54/composer
 
 #
 # RABBITMQ
@@ -102,7 +104,6 @@ RABBITMQ_DEFAULT_PASS=mypass
 # MONGODB
 #
 MONGODB_VERSION=4.1
-MONGODB_DATA_DIR=./data/mongo
 MONGODB_HOST_PORT=27017
 MONGODB_INITDB_ROOT_USERNAME=root
 MONGODB_INITDB_ROOT_PASSWORD=123456
@@ -126,7 +127,6 @@ MONGODB_INITDB_ROOT_PASSWORD=123456
 # ELASTICSEARCH_PLUGINS=analysis-ik,analysis-pinyin
 #
 ELASTICSEARCH_VERSION=7.1.1
-ELASTICSEARCH_DATA_DIR=./data/esdata
 ELASTICSEARCH_CONF_FILE=./services/elasticsearch/elasticsearch.yml
 ELASTICSEARCH_HOST_PORT_C=9200
 ELASTICSEARCH_HOST_PORT_S=9300
@@ -152,7 +152,6 @@ LOGSTASH_HOST_PORT_S=5044
 MYSQL_VERSION=8.0.13
 MYSQL_HOST_PORT=3306
 MYSQL_ROOT_PASSWORD=123456
-MYSQL_DATA_DIR=./data/mysql
 MYSQL_CONF_FILE=./services/mysql/mysql.cnf
 
 #
@@ -161,7 +160,6 @@ MYSQL_CONF_FILE=./services/mysql/mysql.cnf
 MYSQL5_VERSION=5.7.28
 MYSQL5_HOST_PORT=3305
 MYSQL5_ROOT_PASSWORD=123456
-MYSQL5_DATA_DIR=./data/mysql5
 MYSQL5_CONF_FILE=./services/mysql5/mysql.cnf
 
 #