diff --git a/Dockerfile b/Dockerfile index 228600d..b14db73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.2.9 +ARG version=3.1.5 WORKDIR /tmp/build @@ -31,7 +31,6 @@ 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 \ @@ -54,8 +53,6 @@ RUN echo "untar SOPE sources" \ # add sogo.conf ADD sogo.default.conf /etc/sogo/sogo.conf -VOLUME /usr/local/lib/GNUstep/SOGo/WebServerResources - EXPOSE 20000 USER sogo diff --git a/README.md b/README.md index a8dc76b..2c26dd2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Microsoft Outlook support is provided through an OpenChange storage provider to # Use with care and contribute to Inverse Inc -This image is in use in a organization of 80 people, without any known problem (except when we migrated from 2.3 to 3.2, see above). +This image is still experimental. Use with care. Since July 2016, Inverse Inc. [ask for some support](https://sogo.nu/nc/support/faq/article/why-production-packages-required-a-support-contract-from-inverse.html) to provide debian packages. This should help them to increase their investments in SOGo. If you can afford [this](https://sogo.nu/support/index_new.html#/commercial), you should consider getting support on Inverse Inc. @@ -38,10 +38,6 @@ 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' @@ -52,18 +48,16 @@ services: build: context: . args: - # replace by your desired version - version: x.x.x -# if you prefer using a pre-built image (replace by your desired version) -# image: julienfastre/sogo:x.x + version: 3.1.5 +# if you prefer using a pre-built image +# image: julienfastre/sogo:3.1 links: - db volumes: - # replace by your own file + # required to allow nginx to access to resources + - /usr/local/lib/GNUstep/SOGo/WebServerResources/ + # create - /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 @@ -76,19 +70,17 @@ services: links: - sogo volumes_from: - # you will be able to serve assets from sogo image - sogo:ro ports: - # 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" + - "8080:80" volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro ``` -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. +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 @@ -100,26 +92,6 @@ 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 specific version (replace with your own version) -$ docker build --build-arg version=x.x.x . +# launch the build using the version 3.1.5 +$ docker build --build-arg version=3.1.5 . ``` - -## 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 : - -- 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 47a3619..cc4a55b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,26 +2,18 @@ version: '2' services: sogo: - # if you want to build your own image - - build: - context: . - args: - - version=3.2.6a - -# if you want to use builded image, uncomment next line -# image: julienfastre/sogo:3.2 - +# build: +# context: . +# args: +# - version=2.3.16 +# if you want to use builded image + image: julienfastre/sogo:3.1 links: - db volumes: - -# replace by the path to your own sogo.conf file - - - ./../sogo.conf:/etc/sogo/sogo.conf - environment: - - "TZ=Europe/Amsterdam" + - /usr/local/lib/GNUstep/SOGo/WebServerResources/ + - /path/to/my/sogo.conf:/etc/sogo/sogo.conf db: image: postgres:9.5 ports: