From 8e59be23bf1bc7a71098f79d598991dbfc3339be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 12 Sep 2016 11:48:26 +0200 Subject: [PATCH 1/5] setting last version to 2.3.14 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b14db73..14630d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=3.1.5 +ARG version=2.3.14 WORKDIR /tmp/build From 28298a7c9e5fa34f801bbe51ca9986fc3fe61d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 26 Sep 2016 10:19:50 +0200 Subject: [PATCH 2/5] switch to 2.3.15 --- Dockerfile | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14630d7..4d4a6b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=2.3.14 +ARG version=2.3.15 WORKDIR /tmp/build diff --git a/README.md b/README.md index 64f0e3c..d9916f9 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ services: build: context: . args: - version: 2.2.13 -# if you prefer using an image (not created yet) -# image: julienfastre/sogo:3.1 + version: 2.3.15 +# if you prefer using a pre-built image +# image: julienfastre/sogo:2.3 links: - db volumes: From 0f3b71e8d90a8ccecfebba70f7e805c13bb533a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 26 Sep 2016 10:21:34 +0200 Subject: [PATCH 3/5] remove unused file --- download-sources.sh | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 download-sources.sh diff --git a/download-sources.sh b/download-sources.sh deleted file mode 100644 index 74a67e9..0000000 --- a/download-sources.sh +++ /dev/null @@ -1,2 +0,0 @@ -wget -O sope.tar.gz https://github.com/inverse-inc/sope/archive/SOPE-3.1.4.tar.gz -wget -O sogo.tar.gz https://github.com/inverse-inc/sogo/archive/SOGo-3.1.4.tar.gz From c42d809b4c0989b2252a8f039cdeca6ce4eb7ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 26 Sep 2016 10:22:43 +0200 Subject: [PATCH 4/5] adding docker-compose file to repo --- .gitignore | 1 - docker-compose.yml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index ed738eb..8b13789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -docker-compose* diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..9861fec --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +version: '2' + +services: + sogo: + build: + context: . + args: + - version=2.3.15 + + links: + - db + environment: + - "WorkersCount=10" + volumes: + - /usr/local/lib/GNUstep/SOGo/WebServerResources/ + - /home/julienfastre/Documents/informatique/sogo-compil/sogo.conf:/etc/sogo/sogo.conf + db: + image: postgres:9.5 + ports: + - "5432" + memcached: + image: memcached:1.4-alpine + nginx: + image: nginx + links: + - sogo + volumes_from: + - sogo:ro + ports: + - "8080:80" + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + From 3c73d2a9989ead39755748da302b6532c177d425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 5 Oct 2016 12:57:21 +0200 Subject: [PATCH 5/5] switch to 2.3.16 --- Dockerfile | 2 +- docker-compose.yml | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d4a6b3..4c8efa3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Julien Fastré -ARG version=2.3.15 +ARG version=2.3.16 WORKDIR /tmp/build diff --git a/docker-compose.yml b/docker-compose.yml index 9861fec..bf66a44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,18 +2,16 @@ version: '2' services: sogo: - build: - context: . - args: - - version=2.3.15 - +# build: +# context: . +# args: +# - version=2.3.16 + image: julienfastre/sogo:2.3 links: - db - environment: - - "WorkersCount=10" volumes: - /usr/local/lib/GNUstep/SOGo/WebServerResources/ - - /home/julienfastre/Documents/informatique/sogo-compil/sogo.conf:/etc/sogo/sogo.conf + - /path/to/my/sogo.conf:/etc/sogo/sogo.conf db: image: postgres:9.5 ports: