Merge branch 'master' of https://github.com/laradock/laradock
This commit is contained in:
		
							
								
								
									
										11
									
								
								env-example
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								env-example
									
									
									
									
									
								
							@@ -2,6 +2,9 @@
 | 
			
		||||
# Point to your application code, wish should be available at `/var/www`
 | 
			
		||||
APPLICATION=../
 | 
			
		||||
 | 
			
		||||
### Save Data Path (mysql redis mongo...)
 | 
			
		||||
DATA_SAVE_PATH=../data
 | 
			
		||||
 | 
			
		||||
### PHP version (Does not apply for HHVM)
 | 
			
		||||
# PHP_VERSION=56
 | 
			
		||||
PHP_VERSION=70
 | 
			
		||||
@@ -26,7 +29,6 @@ WORKSPACE_INSTALL_LARAVEL_ENVOY=false
 | 
			
		||||
WORKSPACE_INSTALL_DEPLOYER=false
 | 
			
		||||
WORKSPACE_INSTALL_LINUXBREW=false
 | 
			
		||||
WORKSPACE_INSTALL_MC=false
 | 
			
		||||
WORKSPACE_INSTALL_SYMFONY=false
 | 
			
		||||
WORKSPACE_PUID=1000
 | 
			
		||||
WORKSPACE_PGID=1000
 | 
			
		||||
WORKSPACE_NODE_VERSION=stable
 | 
			
		||||
@@ -46,9 +48,9 @@ PHP_FPM_INSTALL_OPCACHE=false
 | 
			
		||||
PHP_FPM_INSTALL_EXIF=false
 | 
			
		||||
PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
 | 
			
		||||
PHP_FPM_INSTALL_MYSQLI=false
 | 
			
		||||
PHP_FPM_INSTALL_MYSQL=false
 | 
			
		||||
PHP_FPM_INSTALL_TOKENIZER=false
 | 
			
		||||
PHP_FPM_INSTALL_INTL=false
 | 
			
		||||
PHP_FPM_INSTALL_GHOSTSCRIPT=false
 | 
			
		||||
 | 
			
		||||
### NGINX Container
 | 
			
		||||
NGINX_HOST_HTTP_PORT=80
 | 
			
		||||
@@ -153,6 +155,11 @@ VARNISH_PROXY2_SERVER=SERVER2
 | 
			
		||||
### HAPROXY Container
 | 
			
		||||
HAPROXY_HOST_HTTP_PORT=8085
 | 
			
		||||
 | 
			
		||||
### JENKINS Container
 | 
			
		||||
JENKINS_HOST_HTTP_PORT=8090
 | 
			
		||||
JENKINS_HOST_SLAVE_AGENT_PORT=50000
 | 
			
		||||
JENKINS_HOME=./jenkins/jenkins_home
 | 
			
		||||
 | 
			
		||||
### MISC
 | 
			
		||||
# Replace with your Docker Host IP (will be appended to /etc/hosts)
 | 
			
		||||
DOCKER_HOST_IP=10.0.75.1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user