diff --git a/Dockerfile b/Dockerfile index 04b481e..228600d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=2.3.17 +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 0388778..a8dc76b 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' @@ -57,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 @@ -69,17 +76,19 @@ services: links: - sogo volumes_from: + # you will be able to serve assets from sogo image - 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 ``` -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. +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 @@ -91,13 +100,26 @@ 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 . ``` +## 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 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 +## 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 4755f62..47a3619 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ services: build: context: . args: - - version=2.3.17 + - version=3.2.6a # if you want to use builded image, uncomment next line -# image: julienfastre/sogo:3.1 +# image: julienfastre/sogo:3.2 links: - db @@ -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: