From 4002719423a8a3ad5ad2315d01b713e5a8daa9b3 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 7 Mar 2021 16:39:30 -0500
Subject: [PATCH] update to version 18 parameterized nextcloud version in build
 files

---
 dockerfiles/services/nextcloud/Jenkinsfile  | 1 +
 dockerfiles/services/nextcloud/cli/build    | 4 ++--
 dockerfiles/services/nextcloud/cli/deploy   | 3 ++-
 dockerfiles/services/nextcloud/cli/rollback | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dockerfiles/services/nextcloud/Jenkinsfile b/dockerfiles/services/nextcloud/Jenkinsfile
index 7397864..f506ebc 100644
--- a/dockerfiles/services/nextcloud/Jenkinsfile
+++ b/dockerfiles/services/nextcloud/Jenkinsfile
@@ -2,6 +2,7 @@ pipeline {
     environment {
         APP_NAME = 'xaibox'
         WORKDIR = 'dockerfiles/services/nextcloud'
+        NC_VERSION = 18
     }
 
     agent { label 'docker' }
diff --git a/dockerfiles/services/nextcloud/cli/build b/dockerfiles/services/nextcloud/cli/build
index c78d459..34df26f 100755
--- a/dockerfiles/services/nextcloud/cli/build
+++ b/dockerfiles/services/nextcloud/cli/build
@@ -2,7 +2,7 @@
 set -e
 #set -x
 
-NC_VERSION=18
+NC_VERSION=${NC_VERSION:-18}
 LOCAL_IMAGE=xaicorp/nextcloud
 TAG=${NC_VERSION}.0-${BUILD_NUMBER:-dev}
 REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG}
@@ -14,7 +14,7 @@ export REMOTE_IMAGE
 export TAG
 
 dc() {
-    export NC_VERSION=${NC_VERSION}
+#    export NC_VERSION=${NC_VERSION}
     # shellcheck disable=SC2068
     docker-compose \
     -f docker-compose.yml \
diff --git a/dockerfiles/services/nextcloud/cli/deploy b/dockerfiles/services/nextcloud/cli/deploy
index 4039e33..8966ef5 100755
--- a/dockerfiles/services/nextcloud/cli/deploy
+++ b/dockerfiles/services/nextcloud/cli/deploy
@@ -2,8 +2,9 @@
 set -e
 #set -x
 
+NC_VERSION=${NC_VERSION:-18}
 LOCAL_IMAGE=xaicorp/nextcloud
-TAG=16.0-${BUILD_NUMBER:-dev}
+TAG=${NC_VERSION}.0-${BUILD_NUMBER:-dev}
 REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG}
 STACK_NAME=xaibox
 SERVICE_NAME=app
diff --git a/dockerfiles/services/nextcloud/cli/rollback b/dockerfiles/services/nextcloud/cli/rollback
index da52650..382bac5 100755
--- a/dockerfiles/services/nextcloud/cli/rollback
+++ b/dockerfiles/services/nextcloud/cli/rollback
@@ -2,8 +2,9 @@
 set -e
 #set -x
 
+NC_VERSION=${NC_VERSION:-18}
 LOCAL_IMAGE=xaicorp/nextcloud
-TAG=16.0-${BUILD_NUMBER:-dev}
+TAG=${NC_VERSION}.0-${BUILD_NUMBER:-dev}
 REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG}
 STACK_NAME=xaibox
 SERVICE_NAME=app