Merge tag 'v8.0.0' into develop

Release 8.0.0
Inveniem · Mar 7, 2022 · 4589b43 · 4589b43
2 parents 702883f + abbd2f0
commit 4589b43
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ this kit:
 | 5.x                 | 1.15-1.21                         | 19.x              | Shell scripts and templates |
 | 6.x                 | 1.16-1.22+                        | 19.x              | Shell scripts and templates |
 | 7.x                 | 1.16-1.22+                        | 20.x              | Kustomize and Rigger        |
+| 8.x                 | 1.16-1.22+                        | 21.x              | Kustomize and Rigger        |
 
 ### Switching from "Shell Script" Deployment to "Kustomize" Deployment
 If you are running version 1.x through 6.x of this kit and are now upgrading to

diff --git a/bin/rigger b/bin/rigger
@@ -615,13 +615,15 @@ sub_show_manifests() {
         -i k=PersistentVolume \
         -i k=PersistentVolumeClaim \
         -i "k=Deployment,n=${deployment}" \
+        -i "k=CronJob,n=${deployment}" \
         -i k=Issuer \
         -i k=Ingress
   else
     # Filter configs to just the deployment requested.
     kustomize build --enable-alpha-plugins . | \
       docker run --rm -i "ryane/kfilt:${kfilt_version_tag}" \
-        -i "k=Deployment,n=${deployment}"
+        -i "k=Deployment,n=${deployment}" \
+        -i "k=CronJob,n=${deployment}"
   fi
 }
 

diff --git a/docker/backend-nextcloud-apache/Dockerfile b/docker/backend-nextcloud-apache/Dockerfile
@@ -8,7 +8,7 @@
 # @copyright Copyright (c) 2019, Inveniem
 # @license GNU AGPL version 3 or any later version
 #
-FROM nextcloud:20.0.14-apache
+FROM nextcloud:21.0.9-apache
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "false"
 

diff --git a/docker/backend-nextcloud-fpm/Dockerfile b/docker/backend-nextcloud-fpm/Dockerfile
@@ -57,7 +57,7 @@ RUN set -eux;\
 ################################################################################
 # This is the container that actually gets pushed.
 #
-FROM nextcloud:20.0.14-fpm-alpine
+FROM nextcloud:21.0.9-fpm-alpine
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "false"
 

diff --git a/docker/middle-nextcloud-nginx/nginx.conf b/docker/middle-nextcloud-nginx/nginx.conf
@@ -84,20 +84,12 @@ http {
         # could take several months.
         #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
 
+        fastcgi_buffers 64 4K;
+
         ## Customizations for the Inveniem AKS Image ##
         # Set max, single-POST upload size. This only affects WebDAV uploads; it
         # does not affect multi-part uploads.
         client_max_body_size 10g;
-        fastcgi_buffers 64 4K;
-
-        # Allow larger uploads.
-        fastcgi_buffer_size 32k;
-        fastcgi_connect_timeout 60;
-        fastcgi_send_timeout 1800;
-        fastcgi_read_timeout 1800;
-
-        # Allow larger responses to be buffered to a file
-        proxy_max_temp_file_size 10240m;
         ## End of Customizations for Inveniem AKS Image ##
 
         # Enable gzip but do not remove ETag headers
@@ -157,30 +149,34 @@ http {
         # `location ~ /(\.|autotest|...)` which would otherwise handle requests
         # for `/.well-known`.
         location ^~ /.well-known {
-            # The rules in this block are an adaptation of the rules
-            # in `.htaccess` that concern `/.well-known`.
+            # The following 6 rules are borrowed from `.htaccess`
 
             ## Customizations for the Inveniem AKS Image ##
             location = /.well-known/carddav {
-                return 301 $frontend_scheme://$host/remote.php/dav;
+                return 301 $frontend_scheme://$host/remote.php/dav/;
             }
 
             location = /.well-known/caldav {
-                return 301 $frontend_scheme://$host/remote.php/dav;
+                return 301 $frontend_scheme://$host/remote.php/dav/;
             }
-            ## End of Customizations for Inveniem AKS Image ##
 
-            location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
-            location /.well-known/pki-validation    { try_files $uri $uri/ =404; }
+            # Anything else is dynamically handled by Nextcloud
+            location ^~ /.well-known {
+                return 301 $frontend_scheme://$host/index.php$uri;
+            }
+            ## End of Customizations for Inveniem AKS Image ##
 
-            # Let Nextcloud's API for `/.well-known` URIs handle all other
-            # requests by passing them to the front-end controller.
-            return 301 /index.php$request_uri;
+            try_files $uri $uri/ =404;
         }
 
         # Rules borrowed from `.htaccess` to hide certain paths from clients
-        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
-        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) {
+            return 404;
+        }
+
+        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
+            return 404;
+        }
 
         # Ensure this block, which passes PHP files to the PHP process, is above the blocks
         # which handle static assets (as seen below). If this block is not declared first,
@@ -208,7 +204,7 @@ http {
             fastcgi_request_buffering off;
         }
 
-        location ~ \.(?:css|js|svg|gif)$ {
+        location ~ \.(?:css|js|svg|gif|map)$ {
             try_files $uri /index.php$request_uri;
             expires 6M;         # Cache-Control policy borrowed from `.htaccess`
             access_log off;     # Optional: Don't log access to assets

diff --git a/docker/nextcloud-cron/Dockerfile b/docker/nextcloud-cron/Dockerfile
@@ -7,7 +7,7 @@
 # @copyright Copyright (c) 2019-2020, Inveniem
 # @license GNU AGPL version 3 or any later version
 #
-FROM nextcloud:20.0.14-fpm
+FROM nextcloud:21.0.9-fpm
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "true"
 

diff --git a/overlays/00-sample/kustomization.yaml b/overlays/00-sample/kustomization.yaml
@@ -96,20 +96,20 @@ images:
 
   - name: inveniem/nextcloud-cron
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-cron
-    newTag: "7.0.0"
+    newTag: "8.0.0"
 
   - name: inveniem/nextcloud-apache
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-apache
-    newTag: "7.0.0"
+    newTag: "8.0.0"
 
   - name: inveniem/nextcloud-fpm
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-fpm
-    newTag: "7.0.0"
+    newTag: "8.0.0"
 
   - name: inveniem/nextcloud-nginx-middleware
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-nginx-middleware
-    newTag: "7.0.0"
+    newTag: "8.0.0"
 
   - name: inveniem/sftp-ws-server
     newName: your-acr-instance.azurecr.io/inveniem/sftp-ws-server
-    newTag: "7.0.0"
+    newTag: "8.0.0"
diff --git a/overlays/00-sample/publish.profile b/overlays/00-sample/publish.profile
@@ -38,17 +38,16 @@ CONTAINER_ENGINE="docker"
 # available in the deployed image.
 #
 NEXTCLOUD_CUSTOM_APPS=(
-    'https://github.com/westberliner/checksum/releases/download/v1.1.2/checksum.tar.gz'
+    'https://github.com/westberliner/checksum/releases/download/v1.1.3/checksum.tar.gz'
     'https://github.com/nextcloud/files_antivirus/releases/download/v3.2.2/files_antivirus.tar.gz'
-    'https://github.com/nextcloud/files_automatedtagging/releases/download/v1.10.1/files_automatedtagging-1.10.1.tar.gz'
-    'https://github.com/nextcloud/files_downloadactivity/releases/download/v1.9.0/files_downloadactivity-1.9.0.tar.gz'
+    'https://github.com/nextcloud/files_automatedtagging/releases/download/v1.11.0/files_automatedtagging-1.11.0.tar.gz'
+    'https://github.com/nextcloud-releases/files_downloadactivity/releases/download/v1.12.0/files_downloadactivity-v1.12.0.tar.gz'
     'https://github.com/nextcloud/files_rightclick/releases/download/v0.15.1/files_rightclick.tar.gz'
     'https://github.com/gino0631/nextcloud-metadata/releases/latest/download/metadata.tar.gz'
-    'https://github.com/owncloud/music/releases/download/v1.3.3/music_1.3.3_for_nextcloud.tar.gz'
-    'https://github.com/pbek/nextbackup/releases/download/21.1.0/nextbackup-nc.tar.gz'
-    'https://github.com/nextcloud/previewgenerator/archive/refs/tags/v3.1.1.tar.gz'
-    'https://github.com/nextcloud/user_external/releases/download/v1.0.0/user_external-1.0.0.tar.gz'
-    'https://github.com/nextcloud/user_saml/releases/download/v3.3.5/user_saml-3.3.5.tar.gz'
+    'https://github.com/owncloud/music/releases/download/v1.5.1/music_1.5.1_for_nextcloud.tar.gz'
+    'https://github.com/nextcloud-releases/previewgenerator/releases/download/v4.0.0/previewgenerator.tar.gz'
+    'https://github.com/nextcloud/user_external/releases/download/v2.1.0/user_external-2.1.0.tar.gz'
+    'https://github.com/nextcloud/user_saml/releases/download/v4.1.1/user_saml-4.1.1.tar.gz'
 )
 
 ################################################################################