22 Release 3.2.2 - See CHANGELOG.md

Author: tiredofit

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -101,11 +101,11 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}

.github/workflows/manual.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -101,11 +101,11 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.2.2 2022-05-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Backport modifications and enhancements from 23 and 24 branch to 22
+      - Update Nextcloud to 22.2.7
+
+
 ## 3.2.1 2022-03-21 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -1,8 +1,8 @@
 FROM docker.io/tiredofit/nginx-php-fpm:8.0
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-ENV NEXTCLOUD_VERSION=22.2.6 \
-    NEXTCLOUD_FILES_BACKEND_VERSION=0.3.0 \
+ENV NEXTCLOUD_VERSION=22.2.7 \
+    NEXTCLOUD_FILES_BACKEND_VERSION=0.4.0 \
     NGINX_WEBROOT="/www/nextcloud" \
     PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
     PHP_ENABLE_BCMATH=TRUE \

install/assets/defaults/30-nextcloud

@@ -58,8 +58,8 @@ LOST_PASSWORD_LINK=${LOST_PASSWORD_LINK:-"disabled"}
 OVERWRITE_HOST=${OVERWRITE_HOST:-""}
 OVERWRITE_PROTOCOL=${OVERWRITE_PROTOCOL:-""}
 PREVIEW_MAX_FILESIZE=${PREVIEW_MAX_FILESIZE:-"50"}
-PREVIEW_MAX_X=${PREVIEW_MAX_X:-100}
-PREVIEW_MAX_Y=${PREVIEW_MAX_Y:-100}
+PREVIEW_MAX_X=${PREVIEW_MAX_X:-1024}
+PREVIEW_MAX_Y=${PREVIEW_MAX_Y:-1024}
 SHARE_FOLDER=${SHARE_FOLDER:-"/"}
 SHARING_MAX_AUTOCOMPLETE_RESULTS=${SHARING_MAX_AUTOCOMPLETE_RESULTS:-0}
 SHARING_MIN_SEARCHSTRING_LENGTH=${SHARING_MIN_SEARCHSTRING_LENGTH:-0}

install/etc/cont-init.d/30-nextcloud

@@ -45,7 +45,7 @@ include("${NGINX_WEBROOT}/config/config.php");
 \$CONFIG['filesystem_check_changes'] = ${ENABLE_FILESYSTEM_CHECK_CHANGES};
 \$CONFIG['force_language'] = '${FORCE_LANGUAGE}';
 \$CONFIG['force_locale'] = '${FORCE_LOCALE}';
-\$CONFIG['forwarded_for_headers'] = array('HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR');
+\$CONFIG['forwarded_for_headers'] = array('HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR' , 'HTTP_X_FORWARDED_FOR' );
 \$CONFIG['hashingCost'] = ${HASHING_COST};
 \$CONFIG['knowledgebaseenabled'] = ${ENABLE_KNOWLEDGE_BASE};
 \$CONFIG['ldapUserCleanupInterval'] = ${LDAP_CLEANUP_INTERVAL};
@@ -78,8 +78,8 @@ include("${NGINX_WEBROOT}/config/config.php");
 \$CONFIG['part_file_in_storage'] = ${ENABLE_PARTFILE_UPLOADS_STORAGE};
 \$CONFIG['preview_libreoffice_path'] = '/usr/bin/libreoffice';
 \$CONFIG['preview_max_filesize_image'] = 50;
-\$CONFIG['preview_max_x'] = ${PREVIEW_MAX_X};
-\$CONFIG['preview_max_y'] = ${PREVIEW_MAX_Y};
+\$CONFIG['preview_max_x'] = ${PREVIEW_MAX_X,,};
+\$CONFIG['preview_max_y'] = ${PREVIEW_MAX_Y,,};
 \$CONFIG['session_keepalive'] = ${ENABLE_SESSION_KEEPALIVE};
 \$CONFIG['share_folder'] = '${SHARE_FOLDER}';
 \$CONFIG['sharing.maxAutocompleteResults'] = ${SHARING_MAX_AUTOCOMPLETE_RESULTS};
@@ -148,20 +148,18 @@ mkdir -p "${TEMP_DIRECTORY}"
 chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${TEMP_DIRECTORY}"
 
 ### Database Check
-case "$DB_TYPE" in
-    "mysql" | "mariadb" | "MYSQL" | "MARIADB" )
+case "${DB_TYPE,,}" in
+    "mysql" | "mariadb" )
         DB_PORT=${DB_PORT:-3306}
-
         sanity_db mariadb
         db_ready mariadb
-
         install_options="--database=mysql --database-host=${DB_HOST} --database-name=${DB_NAME} --database-user=${DB_USER} --database-pass=${DB_PASS} --database-table-space=${DB_PREFIX} --database-port=${DB_PORT}"
      ;;
-    "sqlite" | "SQLITE" | "sqlite3" | "SQLITE3" )
+    sqlite* )
         DB_TYPE="sqlite3"
         install_options="--database-name $SQLITE_DATABASE"
      ;;
-    "postgres" | "postgresql" | "POSTGRES" | "POSTGRESQL" )
+    postgres* )
         DB_PORT=${DB_PORT:-5432}
         sanity_db
         db_ready postgres
@@ -173,17 +171,11 @@ case "$DB_TYPE" in
      ;;
 esac
 
-### Sudo Hack for entering inside the container
-echo "alias occ='sudo -u ${NGINX_USER} php ${NGINX_WEBROOT}/occ'" > /root/.bashrc
-
-mkdir -p "${NGINX_WEBROOT}"
-chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
-
 installed_version="0.0.0~unknown"
-
+mkdir -p "${NGINX_WEBROOT}"
 rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom-apps/ --exclude /themes/ /assets/nextcloud/ "${NGINX_WEBROOT}"/
 mkdir -p "${NGINX_WEBROOT}"/data "${NGINX_WEBROOT}"/config "${NGINX_WEBROOT}"/themes "${NGINX_WEBROOT}"/custom-apps
-chown -R nginx "${NGINX_WEBROOT}"
+chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
 
 for dir in config themes; do
     if directory_empty "${NGINX_WEBROOT}"/"$dir"; then
@@ -209,7 +201,7 @@ if version_greater "$installed_version" "${NEXTCLOUD_VERSION}"; then
     exit 1
 fi
 
-if [ "$ENABLE_AUTO_UPGRADE" = "TRUE" ]; then
+if var_true "${ENABLE_AUTO_UPGRADE}" ; then
   if version_greater "${NEXTCLOUD_VERSION}" "$installed_version"; then
       if [ "$installed_version" != "0.0.0~unknown" ]; then
         silent sudo -u "${NGINX_USER}" php "${NGINX_WEBROOT}"/occ app:list > /tmp/list_before

install/etc/services.available/30-nextcloud/run

@@ -16,4 +16,4 @@ case "$apkArch" in
 esac
 
 print_start "Starting Nextcloud High Performance Files Backend"
-sudo -u nginx /opt/nextcloud_files_backend/bin/${FBArch}/notify_push --port ${FILES_BACKEND_PORT} /www/nextcloud/config/config.php
+sudo -u ${NGINX_USER} /opt/nextcloud_files_backend/bin/${FBArch}/notify_push --port ${FILES_BACKEND_PORT} /www/nextcloud/config/config.php