Merge branch 'release-1.3.2' into stable

osixia · Nov 6, 2017 · 5820e11 · 5820e11
2 parents 3c00a1b + 1f4e133
commit 5820e11
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.2
+  - roundcube 1.3.2
+  - Upgrade baseimage: web-baseimage:1.1.1
+
 ## 1.3.1
   - roundcube 1.3.1
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/roundcube
-VERSION = 1.3.1
+VERSION = 1.3.2
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![](https://images.microbadger.com/badges/image/osixia/roundcube.svg)](http://microbadger.com/images/osixia/roundcube "Get your own image badge on microbadger.com")
 [hub]: https://hub.docker.com/r/osixia/roundcube/
 
-Latest release: 1.3.1 - roundcube 1.3.1 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
+Latest release: 1.3.2 - roundcube 1.3.1 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
 
 **A docker image to run roundcube.**
 

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,9 +1,9 @@
-FROM osixia/web-baseimage:1.1.0
+FROM osixia/web-baseimage:1.1.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # roundcube version
-ARG ROUNDCUBE_VERSION=1.3.1
-ARG ROUNDCUBE_SHA256=f071bbe84f90ba55582289dcef7b70198b81e0aedd4de8422945658bbee3da0b
+ARG ROUNDCUBE_VERSION=1.3.2
+ARG ROUNDCUBE_SHA256=83e4505df8f14a94313f4a8ccc88a0550e85d7798336b680f1040097fe93c50a
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.2

diff --git a/image/service/roundcube/assets/apache2/http.conf b/image/service/roundcube/assets/apache2/http.conf
@@ -6,15 +6,8 @@
 
 	DocumentRoot /var/www/roundcube
 
-	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/roundcube >
 		AllowOverride All

diff --git a/image/service/roundcube/assets/apache2/https.conf b/image/service/roundcube/assets/apache2/https.conf
@@ -6,21 +6,14 @@
 
 	DocumentRoot /var/www/roundcube
 
-	Include /etc/apache2/conf-available/vhost-partial-ssl.conf
+	Include /etc/apache2/conf-available/ssl.conf
 
 	SSLCertificateFile    ${CONTAINER_SERVICE_DIR}/roundcube/assets/apache2/certs/${ROUNDCUBE_HTTPS_CRT_FILENAME}
 	SSLCertificateKeyFile ${CONTAINER_SERVICE_DIR}/roundcube/assets/apache2/certs/${ROUNDCUBE_HTTPS_KEY_FILENAME}
 	#SSLCACertificateFile ${CONTAINER_SERVICE_DIR}/roundcube/assets/apache2/certs/${ROUNDCUBE_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/roundcube >
 		AllowOverride All