From 72856026cd6f1fff2c7677f506be0e11f912c871 Mon Sep 17 00:00:00 2001
From: Richard Morgan <r_morgan@sympatico.ca>
Date: Sat, 27 Oct 2018 09:28:44 -0400
Subject: [PATCH] add healthcheck to portainer

---
 dockerfiles/services/nextcloud/Dockerfile-mono         | 2 +-
 dockerfiles/services/nextcloud/docker-compose-mono.yml | 4 ++--
 dockerfiles/services/nextcloud/docker-compose-prod.yml | 4 ++--
 dockerfiles/services/ui/docker-compose.yml             | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dockerfiles/services/nextcloud/Dockerfile-mono b/dockerfiles/services/nextcloud/Dockerfile-mono
index 64b097a..a4b16f9 100755
--- a/dockerfiles/services/nextcloud/Dockerfile-mono
+++ b/dockerfiles/services/nextcloud/Dockerfile-mono
@@ -1,4 +1,4 @@
-FROM nextcloud:stable-apache
+FROM nextcloud:13-apache
 
 
 RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
diff --git a/dockerfiles/services/nextcloud/docker-compose-mono.yml b/dockerfiles/services/nextcloud/docker-compose-mono.yml
index d12ea7b..af3984f 100755
--- a/dockerfiles/services/nextcloud/docker-compose-mono.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-mono.yml
@@ -2,7 +2,7 @@
 # docker-compose file for nextcloud server
 
 # docker login dkregistry.xai-corp.net:5000
-# docker-compose build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
+# docker-compose -f docker-compose-mono.yml build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
 # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml owncloud
 
 version: '2'
@@ -12,4 +12,4 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile-mono
-    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
+    image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:13
diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml
index 2cd3c5a..a56fab4 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:latest"
+    image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14"
     ports:
       - 8083:80
     volumes:
@@ -43,7 +43,7 @@ services:
         order: start-first
       resources:
         limits:
-          memory: 512M
+          memory: 1024M
 
     networks:
     - prod_ui
diff --git a/dockerfiles/services/ui/docker-compose.yml b/dockerfiles/services/ui/docker-compose.yml
index 2adc94b..99c489f 100644
--- a/dockerfiles/services/ui/docker-compose.yml
+++ b/dockerfiles/services/ui/docker-compose.yml
@@ -37,6 +37,12 @@ services:
 #          cpus: '0.2'
           memory: 32M
 
+    healthcheck:
+      test: ["CMD", "curl", "-If", "http://localhost:9000"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 20s
 
     logging:
       driver: fluentd