From c00508354fdcb232288fc76260d90f5720de45b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 28 Oct 2016 14:14:09 +0200 Subject: [PATCH 01/12] adding a volume with webresources those webresources are share with a nginx container, and contains css / js --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04b481e..69c2f0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=2.3.17 +ARG version=3.1.5 WORKDIR /tmp/build diff --git a/docker-compose.yml b/docker-compose.yml index 4755f62..4434e13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: build: context: . args: - - version=2.3.17 + - version=3.1.5 # if you want to use builded image, uncomment next line # image: julienfastre/sogo:3.1 From 88d083600ea157010bffe2df5f3af9c049683174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 28 Oct 2016 14:40:06 +0200 Subject: [PATCH 02/12] switch to version 3.2 --- Dockerfile | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69c2f0e..3dd021a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.1.5 +ARG version=3.2.0 WORKDIR /tmp/build diff --git a/docker-compose.yml b/docker-compose.yml index 4434e13..ad8a73f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ services: build: context: . args: - - version=3.1.5 + - version=3.2.0 # if you want to use builded image, uncomment next line -# image: julienfastre/sogo:3.1 +# image: julienfastre/sogo:3.2 links: - db From e1a53e43a4a865f8b630937c337ea48de80e4dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 7 Nov 2016 11:13:55 +0100 Subject: [PATCH 03/12] switch to 3.2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3dd021a..d494221 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.0 +ARG version=3.2.1 WORKDIR /tmp/build From 025c9f65a4e75baf67b110b04ca53cda084081fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 27 Nov 2016 16:38:41 +0100 Subject: [PATCH 04/12] upgrade to 3.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d494221..dea76f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.1 +ARG version=3.2.2 WORKDIR /tmp/build From 464a40f5e9f62619c8c60f7a84895549d1736d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 12 Dec 2016 09:56:32 +0100 Subject: [PATCH 05/12] upgrade to 3.2.4 --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dea76f5..20c4692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.2 +ARG version=3.2.4 WORKDIR /tmp/build diff --git a/docker-compose.yml b/docker-compose.yml index ad8a73f..38f5a0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: build: context: . args: - - version=3.2.0 + - version=3.2.4 # if you want to use builded image, uncomment next line # image: julienfastre/sogo:3.2 From 641519769b95d4a3fb4bb189931bfdd879a1a309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 12 Dec 2016 10:04:04 +0100 Subject: [PATCH 06/12] 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/` instead of `http://localhost:8080/SOGo/`. 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/ instead of http://localhost:8080/SOGo/. Simply add the missing port part. - ## How to build this image The parameter `version` is required to build this image. From 591c8fb409a6bbefcb56a82a64e1e50bb80c4604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 23 Jan 2017 09:45:58 +0100 Subject: [PATCH 07/12] switch to version 3.2.5 --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20c4692..3909755 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.4 +ARG version=3.2.5 WORKDIR /tmp/build diff --git a/docker-compose.yml b/docker-compose.yml index 38f5a0f..5b45724 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: build: context: . args: - - version=3.2.4 + - version=3.2.5 # if you want to use builded image, uncomment next line # image: julienfastre/sogo:3.2 From 9a05953534d5fc6c3f081d73071e04ad1b2bb78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 23 Jan 2017 20:58:50 +0100 Subject: [PATCH 08/12] add bug report on README + configuration about port number --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6dbfbcb..74ff7cc 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ services: links: - sogo volumes_from: + # you will be able to serve assets from sogo image - sogo:ro ports: # publish on port 80 @@ -84,7 +85,7 @@ services: ``` -You should then be able to reach sogo on http://localhost:8080/SOGo. +You should then be able to reach sogo on http://localhost:PORT/SOGo. Using the actual `nginx.conf` file **and** using a different port than the port 80 or 443, after login, you will encounter an http error on page `http://localhost/SOGo/` Simply re-add the PORT number to reach correct server. ## How to build this image @@ -102,7 +103,12 @@ $ docker build --build-arg version=3.1.5 . ## migrating from 2.3 to 3.1|3.2 using docker-compose -The assets (css, js, ...) are contained in a volume. Those assets are completely different from version 2.3 to version 3.1 and 3.2. If you used `docker-compose` and migrated from 2.3 to 3.2, you have to remove the volume containing those assets, to let a clean place for the asset for the new version. +The assets (css, js, ...) are contained in a volume. Those assets are completely different from version 2.3 to version 3.1 and 3.2. If you used `docker-compose` and migrated from 2.3 to 3.2, you have to either : +- remove the volume containing those assets, to let a clean place for the asset for the new version. +- or use an anonymous volume, which will be re-created on each restart +## Bug report + +Please reports bug on https://github.com/julienfastre/docker-sogo/issues From 4b8d0a85bcd1bdae8e665a0650d6612bd3668bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 30 Jan 2017 10:44:04 +0100 Subject: [PATCH 09/12] upgrade to 3.2.6a --- Dockerfile | 2 +- README.md | 4 ++++ docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3909755..b7584da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.5 +ARG version=3.2.6a WORKDIR /tmp/build diff --git a/README.md b/README.md index 74ff7cc..62fe635 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,10 @@ The assets (css, js, ...) are contained in a volume. Those assets are completely - remove the volume containing those assets, to let a clean place for the asset for the new version. - or use an anonymous volume, which will be re-created on each restart +## Usage of sendmail / `SOGoMailingMechanism` + +Sendmail is not installed in this image: sogo must be able to send mails using a smtp server. The `sogo.conf` file must have the option `SOGoMailingMechanism` on `smtp`. See [the section "SMTP Server Configuration" of the sogo manual](https://sogo.nu/files/docs/SOGo%20Installation%20Guide.pdf#33). + ## Bug report Please reports bug on https://github.com/julienfastre/docker-sogo/issues diff --git a/docker-compose.yml b/docker-compose.yml index 5b45724..e8a9df3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: build: context: . args: - - version=3.2.5 + - version=3.2.6a # if you want to use builded image, uncomment next line # image: julienfastre/sogo:3.2 From 449c9217d221206ea782953ed57a8c6f94be4a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 6 Mar 2017 10:53:05 +0100 Subject: [PATCH 10/12] abstract version in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62fe635..6352579 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,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 From f30f49d6684c4c6dbd862393e1b61bdc0892a827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 6 Mar 2017 12:01:11 +0100 Subject: [PATCH 11/12] upgrading to 3.2.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b7584da..2130230 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.6a +ARG version=3.2.7 WORKDIR /tmp/build From 4becc16731d8a814acb5cc326e9802d4dfea65ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 19 May 2017 12:23:11 +0200 Subject: [PATCH 12/12] switching to 3.2.9 and add tzdata to container --- Dockerfile | 3 ++- README.md | 7 +++++++ docker-compose.yml | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2130230..228600d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.7 +ARG version=3.2.9 WORKDIR /tmp/build @@ -31,6 +31,7 @@ RUN echo "untar SOPE sources" \ postgresql-server-dev-9.5 \ libmemcached-dev \ libcurl4-openssl-dev \ + tzdata \ && echo "compiling sope & sogo" \ && cd /tmp/SOPE \ && ./configure --with-gnustep --enable-debug --disable-strip \ diff --git a/README.md b/README.md index 6352579..a8dc76b 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,9 @@ services: volumes: # replace by your own file - /path/to/your/file/sogo.conf:/etc/sogo/sogo.conf + environment: + # set the timezone in environment (see https://serverfault.com/a/826222/194817) + - "TZ=Europe/Brussels" db: image: postgres:9.5 # for debug purpose only: reach the database from outside @@ -101,6 +104,10 @@ $ cd docker-sogo $ docker build --build-arg version=x.x.x . ``` +## Timezone issue + +The timezone may be set in environement, using the `TZ` variable. See example in `docker-compose.yml`. + ## migrating from 2.3 to 3.1|3.2 using docker-compose The assets (css, js, ...) are contained in a volume. Those assets are completely different from version 2.3 to version 3.1 and 3.2. If you used `docker-compose` and migrated from 2.3 to 3.2, you have to either : diff --git a/docker-compose.yml b/docker-compose.yml index e8a9df3..47a3619 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,8 @@ services: # replace by the path to your own sogo.conf file - ./../sogo.conf:/etc/sogo/sogo.conf + environment: + - "TZ=Europe/Amsterdam" db: image: postgres:9.5 ports: