mirror of
				https://github.com/mashirozx/docker-php-nginx.git
				synced 2025-05-29 01:49:24 +08:00 
			
		
		
		
	Changed containers to have all the data included and don't mount any volumes
This commit is contained in:
		
							parent
							
								
									c4677b0278
								
							
						
					
					
						commit
						126068b319
					
				@ -1,4 +1,5 @@
 | 
				
			|||||||
FROM php:7.0-fpm
 | 
					FROM debian:jessie
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY config/php.ini /usr/local/etc/php/conf.d/custom.ini
 | 
					COPY src/ /var/www/html/
 | 
				
			||||||
ADD ./src/ /var/www/html/
 | 
					
 | 
				
			||||||
 | 
					VOLUME /var/www/html/
 | 
				
			||||||
 | 
				
			|||||||
@ -17,4 +17,5 @@ See the PHP info on http://docker-app.dev
 | 
				
			|||||||
Resources & inspiration
 | 
					Resources & inspiration
 | 
				
			||||||
-----------------------
 | 
					-----------------------
 | 
				
			||||||
https://ejosh.co/de/2015/09/how-to-link-docker-containers-together
 | 
					https://ejosh.co/de/2015/09/how-to-link-docker-containers-together
 | 
				
			||||||
 | 
					
 | 
				
			||||||
https://github.com/johanan/Ansible-and-Docker
 | 
					https://github.com/johanan/Ansible-and-Docker
 | 
				
			||||||
 | 
				
			|||||||
@ -1,19 +1,15 @@
 | 
				
			|||||||
appdata:
 | 
					appdata:
 | 
				
			||||||
    image: debian:jessie
 | 
					    build: .
 | 
				
			||||||
    volumes:
 | 
					 | 
				
			||||||
        - ./src:/var/www/html
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
fpm:
 | 
					fpm:
 | 
				
			||||||
    build: .
 | 
					    build: ./fpm
 | 
				
			||||||
    volumes_from:
 | 
					    volumes_from:
 | 
				
			||||||
        - appdata
 | 
					        - appdata
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nginx:
 | 
					nginx:
 | 
				
			||||||
    image: nginx:1.9
 | 
					    build: ./nginx
 | 
				
			||||||
    links:
 | 
					    links:
 | 
				
			||||||
        - fpm
 | 
					        - fpm
 | 
				
			||||||
    volumes:
 | 
					 | 
				
			||||||
        - ./config/nginx.conf:/etc/nginx/conf.d/app.conf:ro
 | 
					 | 
				
			||||||
    volumes_from:
 | 
					    volumes_from:
 | 
				
			||||||
        - appdata
 | 
					        - appdata
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										3
									
								
								fpm/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								fpm/Dockerfile
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					FROM php:7.0-fpm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					COPY php.ini /usr/local/etc/php/conf.d/custom.ini
 | 
				
			||||||
							
								
								
									
										3
									
								
								nginx/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								nginx/Dockerfile
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					FROM nginx:1.9
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					COPY nginx.conf /etc/nginx/conf.d/app.conf
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user