From f318e42f8c602b91ac8c0eebad2b74174ff11559 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Thu, 8 Feb 2018 11:36:24 +0100
Subject: [PATCH] Upgrade Nextcloud to 13.0.0

---
 .../files/nextcloud/app/Dockerfile            |  2 +-
 .../files/nextcloud/docker-compose.yml        | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
index 335160f..4e33500 100644
--- a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
+++ b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:fpm
+FROM nextcloud:13.0.0-fpm
 
 RUN apt-get update && apt-get install -y \
   supervisor \
diff --git a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
index feec937..3393146 100644
--- a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
+++ b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
@@ -59,21 +59,21 @@ services:
     image: redis
     restart: always
 
-#  collabora:
-#    image: collabora/code
-#    cap_add:
-#      - MKNOD
-#    expose:
-#      - 9980
-#    environment:
-#      - domain=${CLOUD_DOMAIN}
-#      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
-#      - VIRTUAL_NETWORK=nginx-proxy
-#      - VIRTUAL_PORT=9980
-    #  - VIRTUAL_PROTO=https
-#      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
-#      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
-#    networks:
-#      - proxy-tier
-#      - default
-#    restart: always
+  collabora:
+    image: collabora/code:3.0.0.4
+    cap_add:
+      - MKNOD
+    expose:
+      - 9980
+    environment:
+      - domain=${CLOUD_DOMAIN}
+      - VIRTUAL_HOST=${COLLABORA_DOMAIN}
+      - VIRTUAL_NETWORK=nginx-proxy
+      - VIRTUAL_PORT=9980
+      - VIRTUAL_PROTO=https
+      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
+      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
+    networks:
+      - proxy-tier
+      - default
+    restart: always