Merge pull request #1801 from nextcloud/docker-devel

Prepare v1.51.6

bin/ncp-check-version

@@ -6,7 +6,7 @@ TMPDIR="$( mktemp -d /tmp/ncp-check.XXXXXX || ( echo "Failed to create temp dir.
 trap "rm -rf \"${TMPDIR}\"; exit 0" 0 1 2 3 15
 
 BRANCH="master"
-is_docker && BRANCH="docker-stable"
+{ [[ -f /.dockerenv ]] || [[ -f /.docker-image ]] || [[ "$DOCKERBUILD" == 1 ]]; } && BRANCH="docker-stable"
 
 git clone -b "$BRANCH" --depth 20 -q --bare https://github.com/nextcloud/nextcloudpi.git "$TMPDIR" || {
   echo "The git clone command failed: No connectivity to https://github.com ?" >&2

bin/ncp-test-updates

@@ -4,6 +4,8 @@
 
 NEED_UPDATE=false
 VERFILE=/var/run/.ncp-latest-version
+# Disable internal updater on docker
+{ [[ -f /.dockerenv ]] || [[ -f /.docker-image ]] || [[ "$DOCKERBUILD" == 1 ]]; } && exit 1
 
 [[ $( cat $VERFILE 2>/dev/null | wc -c ) -eq 0 ]] && ncp-check-version
 

changelog.md

@@ -1,5 +1,15 @@
 # NextcloudPi Changelog
 
+## [v1.51.6](https://github.com/nextcloud/nextcloudpi/tree/v1.51.6) (2023-07-26) Minor fixes and NC update
+
+### Changes
+
+Add support for Nextcloud 25.0.9
+
+### Fixes
+
+- Disable internal updater altogether for NCP docker
+
 ## [v1.51.5](https://github.com/nextcloud/nextcloudpi/tree/v1.51.5) (2023-07-16) Minor fixes and NC update
 
 ### Changes

etc/ncp-config.d/nc-nextcloud.cfg

@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "25.0.8"
+      "value": "25.0.9"
     },
     {
       "id": "MAXFILESIZE",

etc/ncp.cfg

@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "25.0.8",
+	"nextcloud_version": "25.0.9",
 	"php_version": "8.1",
 	"release": "bullseye"
 }