[v1.51.5] Merge pull request #1795 from nextcloud/docker-devel

Minor fixes and NC update

### Changes

Add support for Nextcloud 25.0.8

### Fixes

- Fix NCP version check checking against the wrong release version
- Fix nc-backup-auto being broken on systems that have been updated to v1.51.3 from a previous version
- Fix syntax error in ncp-backup

.github/workflows/build-docker.yml

@@ -27,7 +27,7 @@ on:
 jobs:
   build:
     if: ${{ github.repository == 'nextcloud/nextcloudpi' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"
@@ -39,6 +39,10 @@ jobs:
     steps:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
+#      - name: setup binfmt
+#        run: |
+#          sudo apt-get install binfmt-support qemu-user-static
+#
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -71,7 +75,7 @@ jobs:
     if: ${{ inputs.arch != 'armhf' }}
     needs:
       - build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"
@@ -105,10 +109,11 @@ jobs:
               git fetch -fu --tags origin "${ref}:${ref}"
             fi
             version="$(git describe --tags || true)"
-            [[ "$version" =~ .*-.*-.* ]] || {
+            [[ "$version" =~ ^(docker-)?v.*-.*-.* ]] || {
               git checkout HEAD~1
               version="$(git describe --tags || echo latest)"
             }
+            version="${version#docker-}"
             version="${version%-*-*}"
           fi
           curl "https://hub.docker.com/v2/repositories/ownyourbits/nextcloudpi-${ARCH}/tags/${version}" | grep 'errinfo' > /dev/null && {
@@ -389,7 +394,7 @@ jobs:
   test:
     needs:
       - build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"

bin/ncp-backup

@@ -75,15 +75,17 @@ tar $compress_arg -cf "$destfile" \
     "$dbbackup" \
 \
     --exclude "$data/.opcache" \
-    --exclude "$data/{access,error,nextcloud}.log" \
-    --exclude "$data/access.log" \
+    --exclude "nextcloud/data/access.log" \
+    --exclude "nextcloud/data/error.log" \
+    --exclude "nextcloud/data/nextcloud.log" \
     --exclude "$data/ncp-update-backups" \
     -C "$(dirname "$datadir"/)" $data \
 \
     --exclude "nextcloud/data/*/files/*" \
     --exclude "nextcloud/data/.opcache" \
-    --exclude "nextcloud/data/{access,error,nextcloud}.log" \
     --exclude "nextcloud/data/access.log" \
+    --exclude "nextcloud/data/error.log" \
+    --exclude "nextcloud/data/nextcloud.log" \
     --exclude "nextcloud/data/appdata_*/preview/*" \
     --exclude "nextcloud/data/*/uploads/*" \
     --exclude "nextcloud/data/*/cache/*" \
@@ -101,4 +103,4 @@ rm "$dbbackup"
 chmod 640 "$destfile"
 chown :www-data "$destfile"
 
-echo "backup $destfile generated"
+echo "backup $destfile generated"

bin/ncp-check-version

@@ -5,7 +5,10 @@
 TMPDIR="$( mktemp -d /tmp/ncp-check.XXXXXX || ( echo "Failed to create temp dir. Exiting" >&2; exit 1 ) )"
 trap "rm -rf \"${TMPDIR}\"; exit 0" 0 1 2 3 15
 
-git clone --depth 20 -q --bare https://github.com/nextcloud/nextcloudpi.git "$TMPDIR" || {
+BRANCH="master"
+is_docker && 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
   exit 1
 }

changelog.md

@@ -1,5 +1,17 @@
 # NextcloudPi Changelog
 
+## [v1.51.5](https://github.com/nextcloud/nextcloudpi/tree/v1.51.5) (2023-07-16) Minor fixes and NC update
+
+### Changes
+
+Add support for Nextcloud 25.0.8
+
+### Fixes
+
+- Fix NCP version check checking against the wrong release version
+- Fix nc-backup-auto being broken on systems that have been updated to v1.51.3 from a previous version
+- Fix syntax error in ncp-backup
+
 ## [v1.51.4](https://github.com/nextcloud/nextcloudpi/tree/v1.51.4) (2023-05-01) Minor fixes
 
 ### Fixes

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

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

etc/ncp.cfg

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

tests/nextcloud_tests.py

@@ -21,10 +21,7 @@ import configparser
 import signal
 import re
 from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.common.service import Service
 from selenium.webdriver.firefox.webdriver import WebDriver
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.firefox.options import Options
@@ -233,7 +230,7 @@ if __name__ == "__main__":
     print("Nextcloud tests " + tc.yellow + IP + tc.normal)
     print("---------------------------")
 
-    driver = webdriver.Firefox(service_log_path='/dev/null', options=options)
+    driver = webdriver.Firefox(options=options)
     try:
         test_nextcloud(IP, nc_port, driver)
     except Exception as e:

tests/requirements.txt

@@ -1,2 +1,2 @@
-selenium~=4.7
-robotframework~=6.0
+selenium
+robotframework

updates/1.51.5.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source /usr/local/etc/library.sh
+
+jq '.params[].id' "$CFGDIR/nc-backup-auto.cfg" | grep BACKUPHOUR || \
+  set_app_param nc-backup-auto BACKUPHOUR 3