update to version 18

parameterized nextcloud version in build files

dockerfiles/services/nextcloud/Dockerfile-mono

@@ -1,4 +1,5 @@
-FROM nextcloud:17-apache
+ARG NC_VERSION=17
+FROM nextcloud:${NC_VERSION}-apache
 
 RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
 

dockerfiles/services/nextcloud/cli/build

@@ -2,8 +2,9 @@
 set -e
 #set -x
 
+NC_VERSION=18
 LOCAL_IMAGE=xaicorp/nextcloud
-TAG=17.0-${BUILD_NUMBER:-dev}
+TAG=${NC_VERSION}.0-${BUILD_NUMBER:-dev}
 REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG}
 
 LOG=$(mktemp)
@@ -13,6 +14,7 @@ export REMOTE_IMAGE
 export TAG
 
 dc() {
+    export NC_VERSION=${NC_VERSION}
     # shellcheck disable=SC2068
     docker-compose \
     -f docker-compose.yml \
@@ -29,8 +31,7 @@ build() {
 build_test() {
   echo -e "\e[33m testing the image\e[39m"
 
-  #todo test that occ is present
-  dc run --rm app php /usr/src/nextcloud/occ --version
+  dc run --rm app php /usr/src/nextcloud/occ --version | grep ${NC_VERSION}
 
 
   #test for smbclient installed

dockerfiles/services/nextcloud/docker-compose.build.yml

@@ -12,6 +12,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile-mono
+      args:
+        NC_VERSION: ${NC_VERSION:-17}
 
     volumes:
       - ./config:/var/www/html/config