Merge branch master into levi
This commit is contained in:
		
						commit
						dab58d915a
					
				@ -3,7 +3,7 @@ FROM ubuntu:20.04
 | 
				
			|||||||
# install necessary packages
 | 
					# install necessary packages
 | 
				
			||||||
RUN \
 | 
					RUN \
 | 
				
			||||||
  apt-get update && \
 | 
					  apt-get update && \
 | 
				
			||||||
  DEBIAN_FRONTEND="noninteractive" apt-get install apache2 php libapache2-mod-php php-mysql php-xdebug imagemagick -y
 | 
					  DEBIAN_FRONTEND="noninteractive" apt-get install apache2 php libapache2-mod-php php-mysql php-xdebug imagemagick libimage-exiftool-perl -y
 | 
				
			||||||
#  rm -rf /var/lib/apt/lists/*
 | 
					#  rm -rf /var/lib/apt/lists/*
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
# define volumes
 | 
					# define volumes
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								wwwdata
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								wwwdata
									
									
									
									
									
								
							@ -1 +1 @@
 | 
				
			|||||||
Subproject commit 5a46f394f01bd29f6ed93b057b78ad41ded8e21c
 | 
					Subproject commit 71c68865eac8ca8c6e72c085754631b83d7ae298
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user