Merge pull request #810 from wxb/master
set data save path(mysql/redis/memcached..)
This commit is contained in:
		@@ -69,6 +69,8 @@ services:
 | 
				
			|||||||
        dockerfile: "Dockerfile-${PHP_VERSION}"
 | 
					        dockerfile: "Dockerfile-${PHP_VERSION}"
 | 
				
			||||||
      volumes_from:
 | 
					      volumes_from:
 | 
				
			||||||
        - applications
 | 
					        - applications
 | 
				
			||||||
 | 
					      volumes:
 | 
				
			||||||
 | 
					        - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
 | 
				
			||||||
      expose:
 | 
					      expose:
 | 
				
			||||||
        - "9000"
 | 
					        - "9000"
 | 
				
			||||||
      depends_on:
 | 
					      depends_on:
 | 
				
			||||||
@@ -173,7 +175,7 @@ services:
 | 
				
			|||||||
        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
 | 
					        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
 | 
				
			||||||
        - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
 | 
					        - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - mysql:/var/lib/mysql
 | 
					        - ${DATA_SAVE_PATH}/mysql:/var/lib/mysql
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${MYSQL_PORT}:3306"
 | 
					        - "${MYSQL_PORT}:3306"
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
@@ -189,7 +191,7 @@ services:
 | 
				
			|||||||
        - SA_PASSWORD=${MSSQL_PASSWORD}
 | 
					        - SA_PASSWORD=${MSSQL_PASSWORD}
 | 
				
			||||||
        - ACCEPT_EULA=Y
 | 
					        - ACCEPT_EULA=Y
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - mssql:/var/opt/mssql
 | 
					        - ${DATA_SAVE_PATH}/mssql:/var/opt/mssql
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${MSSQL_PORT}:1433"
 | 
					        - "${MSSQL_PORT}:1433"
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
@@ -200,7 +202,7 @@ services:
 | 
				
			|||||||
    mariadb:
 | 
					    mariadb:
 | 
				
			||||||
      build: ./mariadb
 | 
					      build: ./mariadb
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - mariadb:/var/lib/mysql
 | 
					        - ${DATA_SAVE_PATH}/mariadb:/var/lib/mysql
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${MARIADB_PORT}:3306"
 | 
					        - "${MARIADB_PORT}:3306"
 | 
				
			||||||
      environment:
 | 
					      environment:
 | 
				
			||||||
@@ -216,7 +218,7 @@ services:
 | 
				
			|||||||
    postgres:
 | 
					    postgres:
 | 
				
			||||||
      build: ./postgres
 | 
					      build: ./postgres
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - postgres:/var/lib/postgresql/data
 | 
					        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${POSTGRES_PORT}:5432"
 | 
					        - "${POSTGRES_PORT}:5432"
 | 
				
			||||||
      environment:
 | 
					      environment:
 | 
				
			||||||
@@ -231,7 +233,7 @@ services:
 | 
				
			|||||||
    postgres-postgis:
 | 
					    postgres-postgis:
 | 
				
			||||||
      build: ./postgres-postgis
 | 
					      build: ./postgres-postgis
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - postgres:/var/lib/postgresql/data
 | 
					        - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${POSTGRES_PORT}:5432"
 | 
					        - "${POSTGRES_PORT}:5432"
 | 
				
			||||||
      environment:
 | 
					      environment:
 | 
				
			||||||
@@ -251,7 +253,7 @@ services:
 | 
				
			|||||||
      environment:
 | 
					      environment:
 | 
				
			||||||
        - NEO4J_AUTH=default:secret
 | 
					        - NEO4J_AUTH=default:secret
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - neo4j:/var/lib/neo4j/data
 | 
					        - ${DATA_SAVE_PATH}/neo4j:/var/lib/neo4j/data
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
        - backend
 | 
					        - backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -262,7 +264,7 @@ services:
 | 
				
			|||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "27017:27017"
 | 
					        - "27017:27017"
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - mongo:/data/db
 | 
					        - ${DATA_SAVE_PATH}/mongo:/data/db
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
        - backend
 | 
					        - backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -273,7 +275,7 @@ services:
 | 
				
			|||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "8090:8080"
 | 
					        - "8090:8080"
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - rethinkdb:/data/rethinkdb_data
 | 
					        - ${DATA_SAVE_PATH}/rethinkdb:/data/rethinkdb_data
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
        - backend
 | 
					        - backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -282,7 +284,7 @@ services:
 | 
				
			|||||||
    redis:
 | 
					    redis:
 | 
				
			||||||
      build: ./redis
 | 
					      build: ./redis
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - redis:/data
 | 
					        - ${DATA_SAVE_PATH}/redis:/data
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "6379:6379"
 | 
					        - "6379:6379"
 | 
				
			||||||
      networks:
 | 
					      networks:
 | 
				
			||||||
@@ -295,7 +297,7 @@ services:
 | 
				
			|||||||
      volumes_from:
 | 
					      volumes_from:
 | 
				
			||||||
        - workspace
 | 
					        - workspace
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - aerospike:/opt/aerospike/data
 | 
					        - ${DATA_SAVE_PATH}/aerospike:/opt/aerospike/data
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "3000:3000"
 | 
					        - "3000:3000"
 | 
				
			||||||
        - "3001:3001"
 | 
					        - "3001:3001"
 | 
				
			||||||
@@ -309,7 +311,7 @@ services:
 | 
				
			|||||||
    memcached:
 | 
					    memcached:
 | 
				
			||||||
      build: ./memcached
 | 
					      build: ./memcached
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - memcached:/var/lib/memcached
 | 
					        - ${DATA_SAVE_PATH}/memcached:/var/lib/memcached
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${MEMCACHED_HOST_PORT}:11211"
 | 
					        - "${MEMCACHED_HOST_PORT}:11211"
 | 
				
			||||||
      depends_on:
 | 
					      depends_on:
 | 
				
			||||||
@@ -523,10 +525,10 @@ services:
 | 
				
			|||||||
        JAVA_OPTS: "-Djava.awt.headless=true"
 | 
					        JAVA_OPTS: "-Djava.awt.headless=true"
 | 
				
			||||||
      ports:
 | 
					      ports:
 | 
				
			||||||
        - "${JENKINS_HOST_SLAVE_AGENT_PORT}:50000"
 | 
					        - "${JENKINS_HOST_SLAVE_AGENT_PORT}:50000"
 | 
				
			||||||
        - "${JENKINS_HOST_HTTP_PORT}:8080"      
 | 
					        - "${JENKINS_HOST_HTTP_PORT}:8080"
 | 
				
			||||||
      privileged: true
 | 
					      privileged: true
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - ${JENKINS_HOME}:/var/jenkins_home        
 | 
					        - ${JENKINS_HOME}:/var/jenkins_home
 | 
				
			||||||
        - /var/run/docker.sock:/var/run/docker.sock
 | 
					        - /var/run/docker.sock:/var/run/docker.sock
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Networks Setup ############################################
 | 
					### Networks Setup ############################################
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,6 +2,9 @@
 | 
				
			|||||||
# Point to your application code, wish should be available at `/var/www`
 | 
					# Point to your application code, wish should be available at `/var/www`
 | 
				
			||||||
APPLICATION=../
 | 
					APPLICATION=../
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Save Data Path (mysql redis mongo...)
 | 
				
			||||||
 | 
					DATA_SAVE_PATH=../data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### PHP version (Does not apply for HHVM)
 | 
					### PHP version (Does not apply for HHVM)
 | 
				
			||||||
# PHP_VERSION=56
 | 
					# PHP_VERSION=56
 | 
				
			||||||
PHP_VERSION=70
 | 
					PHP_VERSION=70
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2030
									
								
								php-fpm/php56.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2030
									
								
								php-fpm/php56.ini
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1918
									
								
								php-fpm/php70.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1918
									
								
								php-fpm/php70.ini
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user