Merge branch 'release-1.3.3' into stable

osixia · Nov 10, 2017 · 958d4e4 · 958d4e4
2 parents 2ec4c6e + fc2b0fa
commit 958d4e4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.3
+  - roundcube 1.3.3
+  - Add robots.txt 
+
 ## 1.3.2
   - roundcube 1.3.2
   - Upgrade baseimage: web-baseimage:1.1.1

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

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 ![Docker Stars](https://img.shields.io/docker/stars/osixia/roundcube.svg)
 ![](https://images.microbadger.com/badges/image/osixia/roundcube.svg)
 
-Latest release: 1.3.2 - roundcube 1.3.2 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
+Latest release: 1.3.3 - roundcube 1.3.3 -  [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
@@ -2,8 +2,8 @@ FROM osixia/web-baseimage:1.1.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # roundcube version
-ARG ROUNDCUBE_VERSION=1.3.2
-ARG ROUNDCUBE_SHA256=83e4505df8f14a94313f4a8ccc88a0550e85d7798336b680f1040097fe93c50a
+ARG ROUNDCUBE_VERSION=1.3.3
+ARG ROUNDCUBE_SHA256=05d9856c966c0d93accabf724e7ff2fd493bba1a57c44247ed0a2aacd617c879
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.2

diff --git a/image/service/roundcube/assets/robots.txt b/image/service/roundcube/assets/robots.txt
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: /
diff --git a/image/service/roundcube/install.sh b/image/service/roundcube/install.sh
@@ -16,3 +16,6 @@ rm -rf /var/www/html
 
 # Add apache modules
 a2enmod deflate expires
+
+# copy robots.txt
+cp -f /container/service/roundcube/assets/robots.txt /var/www/roundcube_bootstrap/robots.txt