|  | @@ -16,17 +16,22 @@ RUN apt-get update && apt-get -y install\
 | 
		
	
		
			
			| 16 | 16 |          php5-intl\
 | 
		
	
		
			
			| 17 | 17 |          php5-ldap\
 | 
		
	
		
			
			| 18 | 18 |          php5-imap &&\
 | 
		
	
		
			
			| 19 |  | -        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* &&\
 | 
		
	
		
			
			| 20 |  | -        /usr/sbin/a2enmod rewrite &&\
 | 
		
	
		
			
			| 21 |  | -        rm -rf /var/www/html &&\
 | 
		
	
		
			
			| 22 |  | -        mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
 | 
		
	
		
			
			| 23 |  | -        chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
 | 
		
	
		
			
			| 24 |  | -        ln -sf /dev/stderr /var/log/apache2/error.log &&\
 | 
		
	
		
			
			| 25 |  | -        ln -sf /dev/stdout /var/log/apache2/access.log
 | 
		
	
		
			
			|  | 19 | +        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 | 
		
	
		
			
			|  | 20 | +
 | 
		
	
		
			
			|  | 21 | +RUN /usr/sbin/a2enmod rewrite &&\
 | 
		
	
		
			
			|  | 22 | +    rm -rf /var/www/html &&\
 | 
		
	
		
			
			|  | 23 | +    mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
 | 
		
	
		
			
			|  | 24 | +    chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 | 
		
	
		
			
			|  | 25 | +
 | 
		
	
		
			
			|  | 26 | +RUN rm -rf /var/log/* &&\
 | 
		
	
		
			
			|  | 27 | +    mkdir -p /var/log/apache2 &&\
 | 
		
	
		
			
			|  | 28 | +    ln -s /dev/stderr /var/log/apache2/error.log &&\
 | 
		
	
		
			
			|  | 29 | +    ln -s /dev/stdout /var/log/apache2/access.log &&\
 | 
		
	
		
			
			|  | 30 | +    ln -s /dev/stdout /var/log/apache2/other_vhosts_access.log
 | 
		
	
		
			
			| 26 | 31 |  
 | 
		
	
		
			
			| 27 | 32 |  COPY ./apache2.conf /etc/apache2/apache2.conf
 | 
		
	
		
			
			| 28 | 33 |  
 | 
		
	
		
			
			| 29 |  | -COPY run.sh /run.sh
 | 
		
	
		
			
			|  | 34 | +COPY ./run.sh /run.sh
 | 
		
	
		
			
			| 30 | 35 |  
 | 
		
	
		
			
			| 31 | 36 |  EXPOSE 80
 | 
		
	
		
			
			| 32 | 37 |  
 |