From 6110ac386fa78c01a4cf26acf09ea32930649a71 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 9 Oct 2017 15:45:48 +0200
Subject: [PATCH] [SOGo] Use official nightly; [PHP-FPM] Fix expose=off

---
 data/Dockerfiles/sogo/Dockerfile | 4 ++--
 docker-compose.yml               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile
index a9cefc47..1bfca949 100644
--- a/data/Dockerfiles/sogo/Dockerfile
+++ b/data/Dockerfiles/sogo/Dockerfile
@@ -28,8 +28,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN mkdir /usr/share/doc/sogo \
 	&& touch /usr/share/doc/sogo/empty.sh \
-	&& apt-key adv --keyserver sks.labs.nic.cz --recv-key A04BE668 \
-	&& echo "deb http://www.axis.cz/linux/debian stretch sogo-v3" > /etc/apt/sources.list.d/sogo.list \
+	&& apt-key adv --keyserver keys.gnupg.net --recv-key 0x810273C4 \
+	&& echo "deb http://packages.inverse.ca/SOGo/nightly/3/debian/ stretch stretch" > /etc/apt/sources.list.d/sogo.list \
 	&& apt-get update && apt-get install -y --force-yes \
 		sogo \
 		sogo-activesync \
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a1c5e81..a68649b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -98,7 +98,7 @@ services:
     php-fpm-mailcow:
       image: mailcow/phpfpm:1.3
       build: ./data/Dockerfiles/phpfpm
-      command: "php-fpm -d date.timezone=${TZ} expose_php=0"
+      command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
         - redis-mailcow
       volumes:
@@ -127,7 +127,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.9
+      image: mailcow/sogo:1.10
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}