From 1e0b7b4ee41de23d41449e2d1a204c9f624f6090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?=
 <julienfastre@users.noreply.github.com>
Date: Wed, 5 Oct 2016 14:15:15 +0200
Subject: [PATCH 1/3] switch to 3.1.5

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cc4a55b..35888f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
 #      build: 
 #         context: .
 #         args:
-#            - version=2.3.16
+#            - version=3.1.5
 #     if you want to use builded image
       image: julienfastre/sogo:3.1
       links: 

From e2405d1eba86ec4e40c5b38e96fcbcd9657c5ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Mon, 12 Dec 2016 10:04:04 +0100
Subject: [PATCH 2/3] improve doc about port redirection

---
 README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0388778..6dbfbcb 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ In order to run it You should create an adapt a config file to your needs, [usin
 
 This is a `docker-compose.yml` file you could adapt to launch this image :
 
+**Note** : the docker compose file in this project can be used, but it is using a non-standard port. After login, if you use a different port thant port 80, the redirection will not work and you will be redirected to `http://localhost/SOGo/<your path>` instead of `http://localhost:8080/SOGo/<your path>`. Simply add the missing port part (replace `http://localhost/SOGo` by `http://localhost:8080/SOGo`).
+
+
+
 ```
 
 version: '2'
@@ -71,7 +75,10 @@ services:
       volumes_from:
          - sogo:ro
       ports:
-         - "8080:80"
+          # publish on port 80
+          - "80:80"
+          # if port 80 is already in use, **replace** by this line. (for testing only) Note that, after login, you will have to add the ":8080" in url
+#         - "8080:80"
       volumes: 
          - ./nginx.conf:/etc/nginx/nginx.conf:ro
 
@@ -79,8 +86,6 @@ services:
 
 You should then be able to reach sogo on http://localhost:8080/SOGo.
 
-**Warning** after login, the redirection does not work and you will reach http://localhost/SOGo/<your path> instead of http://localhost:8080/SOGo/<your path>. Simply add the missing port part.
-
 ## How to build this image
 
 The parameter `version` is required to build this image.

From 3616e4da20f4c7dc2c51773affe26672cbd472b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Mon, 6 Mar 2017 10:53:05 +0100
Subject: [PATCH 3/3] abstract version in readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6dbfbcb..339182a 100644
--- a/README.md
+++ b/README.md
@@ -96,8 +96,8 @@ Example of how to build this image :
 # download sources
 $ git clone https://framagit.org/julienfastre/docker-sogo.git
 $ cd docker-sogo
-# launch the build using the version 3.1.5
-$ docker build --build-arg version=3.1.5 .
+# launch the build using specific version (replace with your own version)
+$ docker build --build-arg version=x.x.x .
 ```
 
 ## migrating from 2.3 to 3.1|3.2 using docker-compose