From 84b936c50ca6bcb0c00d0f7a911699c51521db1a Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sat, 16 Feb 2019 21:47:58 -0500
Subject: [PATCH] update nextcloud to version 15

---
 dockerfiles/services/build_apps.sh                     | 5 +++--
 dockerfiles/services/nextcloud/Dockerfile-mono         | 2 +-
 dockerfiles/services/nextcloud/build.sh                | 7 +++++++
 dockerfiles/services/nextcloud/deploy.sh               | 3 ++-
 dockerfiles/services/nextcloud/docker-compose-mono.yml | 2 +-
 dockerfiles/services/nextcloud/docker-compose-prod.yml | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 dockerfiles/services/nextcloud/build.sh

diff --git a/dockerfiles/services/build_apps.sh b/dockerfiles/services/build_apps.sh
index 9f0ae2c..ba00da2 100644
--- a/dockerfiles/services/build_apps.sh
+++ b/dockerfiles/services/build_apps.sh
@@ -2,12 +2,13 @@
 
 docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
 
-(cd nextcloud && docker-compose -f docker-compose-mono.yml build)
+#(cd nextcloud && docker-compose -f docker-compose-mono.yml build)
 (cd sslproxy && docker-compose -f docker-compose.yml build)
 (cd letsencrypt && docker-compose -f docker-compose.yml build)
 (cd prometheus && docker-compose -f docker-compose.yml build)
 
-docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
+#docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15
+./nextcloud/build.sh
 docker push dkregistry.xai-corp.net:5000/sslproxy:2.1
 docker push dkregistry.xai-corp.net:5000/letsencrypt:latest
 docker push dkregistry.xai-corp.net:5000/xaicorp/prometheus:latest
diff --git a/dockerfiles/services/nextcloud/Dockerfile-mono b/dockerfiles/services/nextcloud/Dockerfile-mono
index 9c15f8b..3e4a8fa 100755
--- a/dockerfiles/services/nextcloud/Dockerfile-mono
+++ b/dockerfiles/services/nextcloud/Dockerfile-mono
@@ -1,4 +1,4 @@
-FROM nextcloud:14-apache
+FROM nextcloud:15-apache
 
 
 RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
diff --git a/dockerfiles/services/nextcloud/build.sh b/dockerfiles/services/nextcloud/build.sh
new file mode 100644
index 0000000..f5cfba0
--- /dev/null
+++ b/dockerfiles/services/nextcloud/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+
+export DOCKER_HOST=dkmanager:2376
+docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
+
+docker-compose -f docker-compose-mono.yml build
+docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15
diff --git a/dockerfiles/services/nextcloud/deploy.sh b/dockerfiles/services/nextcloud/deploy.sh
index fb6d518..2e7a302 100644
--- a/dockerfiles/services/nextcloud/deploy.sh
+++ b/dockerfiles/services/nextcloud/deploy.sh
@@ -6,4 +6,5 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
 
 docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml xaibox
 
-docker service update -q xaibox_app
+#docker service update -q xaibox_app
+(cd ../ && ./scaleout.sh xaibox_app 180)
diff --git a/dockerfiles/services/nextcloud/docker-compose-mono.yml b/dockerfiles/services/nextcloud/docker-compose-mono.yml
index eacf89a..0201258 100755
--- a/dockerfiles/services/nextcloud/docker-compose-mono.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-mono.yml
@@ -12,4 +12,4 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile-mono
-    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14
+    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15
diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml
index 00b09d6..d9706bd 100755
--- a/dockerfiles/services/nextcloud/docker-compose-prod.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml
@@ -12,7 +12,7 @@ volumes:
 services:
 
   app:
-    image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14"
+    image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15"
     ports:
       - 8083:80
     volumes: