web-baseimage:1.1.1

osixia · Oct 26, 2017 · 9d2fa4d · 9d2fa4d
1 parent 28d7905
commit 9d2fa4d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.7.1
   - Optimise apache config
   - Add opcache config
+  - Upgrade baseimage: web-baseimage:1.1.1
 
 ## 0.7.0
   - add config.php in config folder

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/web-baseimage:1.1.0
+FROM osixia/web-baseimage:1.1.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # phpLDAPadmin version

diff --git a/image/service/phpldapadmin/assets/apache2/http.conf b/image/service/phpldapadmin/assets/apache2/http.conf
@@ -6,15 +6,8 @@
 
 	DocumentRoot /var/www/phpldapadmin/htdocs
 
-	SetOutputFilter DEFLATE
-	DeflateCompressionLevel 9
-	AddOutputFilterByType DEFLATE text/html application/javascript text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml image/x-icon
-	Header append Vary User-Agent env=!dont-vary
-
-	<Filesmatch "\.(ico|css|js|gif|jpg|jpeg|png|svg|eot|ttf|woff|woff2)$">
-		ExpiresActive on
-		ExpiresDefault "access plus 30 days"
-	</Filesmatch>
+	Include /etc/apache2/conf-available/gzip.conf
+	Include /etc/apache2/conf-available/cache.conf
 
 	<Directory /var/www/phpldapadmin/htdocs >
 		Require all granted

diff --git a/image/service/phpldapadmin/assets/apache2/https.conf b/image/service/phpldapadmin/assets/apache2/https.conf
@@ -6,21 +6,14 @@
 
 	DocumentRoot /var/www/phpldapadmin/htdocs
 
-	Include /etc/apache2/conf-available/vhost-partial-ssl.conf
+	Include /etc/apache2/conf-available/ssl.conf
 
 	SSLCertificateFile    ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_CRT_FILENAME}
 	SSLCertificateKeyFile ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_KEY_FILENAME}
 	#SSLCACertificateFile ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME}
 
-	SetOutputFilter DEFLATE
-	DeflateCompressionLevel 9
-	AddOutputFilterByType DEFLATE text/html application/javascript text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml image/x-icon
-	Header append Vary User-Agent env=!dont-vary
-
-	<Filesmatch "\.(ico|css|js|gif|jpg|jpeg|png|svg|eot|ttf|woff|woff2)$">
-		ExpiresActive on
-		ExpiresDefault "access plus 30 days"
-	</Filesmatch>
+	Include /etc/apache2/conf-available/gzip.conf
+	Include /etc/apache2/conf-available/cache.conf
 
 	<Directory /var/www/phpldapadmin/htdocs >
 		Require all granted