Merge pull request #281 from linuxserver/adjust-cron

Remove cron service (not needed)

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- Provide a general summary of the bug in the Title above -->
-
-------------------------------
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Environment
-**OS:**
-**CPU architecture:** x86_64/arm32/arm64
-**How docker service was installed:**
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Command used to create docker container (run/create/compose/screenshot)
-<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
-
-## Docker logs
-<!--- Provide a full docker log, output of "docker logs nextcloud" -->

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -0,0 +1,77 @@
+# Based on the issue template
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG] <title>"
+labels: [Bug]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Tell us what should happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **How docker service was installed**: distro's packagemanager
+      value: |
+        - OS:
+        - How docker service was installed:
+      render: markdown
+    validations:
+      required: false
+  - type: dropdown
+    attributes:
+      label: CPU architecture
+      options:
+        - x86-64
+        - arm64
+        - armhf
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Docker creation
+      description: |
+        Command used to create docker container
+        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      description: |
+        Provide a full docker log, output of "docker logs linuxserver.io"
+      label: Container logs
+      placeholder: |
+        Output of `docker logs linuxserver.io`
+      render: bash
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
-<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
-
-<!--- Provide a general summary of the request in the Title above -->
-
-------------------------------
-
-## Desired Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Alternatives Considered
-<!--- Tell us what other options you have tried or considered -->

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -0,0 +1,31 @@
+# Based on the issue template
+name: Feature request
+description: Suggest an idea for this project
+title: "[FEAT] <title>"
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this a new feature request?
+      description: Please search to see if a feature request already exists.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Wanted change
+      description: Tell us what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reason for change
+      description: Justify your request, why do you want it, what is the benefit.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed code change
+      description: Do you have a potential code change in mind?
+    validations:
+      required: false

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'
@@ -48,8 +48,12 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
         pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v6.0.1
       with:
         stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
         stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -12,18 +12,6 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
   LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies --upgrade \
-    autoconf \
-    automake \
-    file \
-    g++ \
-    gcc \
-    make \
-    php7-dev \
-    re2c \
-    samba-dev \
-    zlib-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
     curl \
@@ -31,52 +19,52 @@ RUN \
     gnu-libiconv \
     imagemagick \
     libxml2 \
-    php7-apcu \
-    php7-bcmath \
-    php7-bz2 \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-exif \
-    php7-fileinfo \
-    php7-ftp \
-    php7-gd \
-    php7-gmp \
-    php7-iconv \
-    php7-imagick \
-    php7-imap \
-    php7-intl \
-    php7-ldap \
-    php7-mcrypt \
-    php7-memcached \
-    php7-opcache \
-    php7-pcntl \
-    php7-pdo_mysql \
-    php7-pdo_pgsql \
-    php7-pdo_sqlite \
-    php7-pgsql \
-    php7-phar \
-    php7-posix \
-    php7-redis \
-    php7-sodium \
-    php7-sqlite3 \
-    php7-xmlreader \
-    php7-zip \
+    php8-apcu \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-mbstring \
+    php8-opcache \
+    php8-openssl \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-session \
+    php8-simplexml \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xml \
+    php8-xmlreader \
+    php8-xmlwriter \
+    php8-zip \
     samba-client \
     sudo \
     tar \
     unzip && \
-  echo "**** compile smbclient ****" && \
-  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
-  cd /tmp/smbclient && \
-  phpize7 && \
-  ./configure \
-    --with-php-config=/usr/bin/php-config7 && \
-  make && \
-  make install && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-smbclient && \
   echo "**** configure php and nginx for nextcloud ****" && \
-  echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
-  echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
+  echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
     -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
@@ -89,11 +77,12 @@ RUN \
     -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
     -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
     -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-      /etc/php7/php.ini && \
+    -e 's/output_buffering.*=.*/output_buffering=0/g' \
+      /etc/php8/php.ini && \
   sed -i \
     '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php7/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+      /etc/php8/php.ini && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
     NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -107,8 +96,6 @@ RUN \
     tar xvf /app/nextcloud.tar.bz2 -C \
       /tmp && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /tmp/*
 
@@ -116,5 +103,5 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 443
-VOLUME /config /data
+EXPOSE 80 443
+VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -12,18 +12,6 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
   LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies --upgrade \
-    autoconf \
-    automake \
-    file \
-    g++ \
-    gcc \
-    make \
-    php7-dev \
-    re2c \
-    samba-dev \
-    zlib-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
     curl \
@@ -31,52 +19,52 @@ RUN \
     gnu-libiconv \
     imagemagick \
     libxml2 \
-    php7-apcu \
-    php7-bcmath \
-    php7-bz2 \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-exif \
-    php7-fileinfo \
-    php7-ftp \
-    php7-gd \
-    php7-gmp \
-    php7-iconv \
-    php7-imagick \
-    php7-imap \
-    php7-intl \
-    php7-ldap \
-    php7-mcrypt \
-    php7-memcached \
-    php7-opcache \
-    php7-pcntl \
-    php7-pdo_mysql \
-    php7-pdo_pgsql \
-    php7-pdo_sqlite \
-    php7-pgsql \
-    php7-phar \
-    php7-posix \
-    php7-redis \
-    php7-sodium \
-    php7-sqlite3 \
-    php7-xmlreader \
-    php7-zip \
+    php8-apcu \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-mbstring \
+    php8-opcache \
+    php8-openssl \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-session \
+    php8-simplexml \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xml \
+    php8-xmlreader \
+    php8-xmlwriter \
+    php8-zip \
     samba-client \
     sudo \
     tar \
     unzip && \
-  echo "**** compile smbclient ****" && \
-  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
-  cd /tmp/smbclient && \
-  phpize7 && \
-  ./configure \
-    --with-php-config=/usr/bin/php-config7 && \
-  make && \
-  make install && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-smbclient && \
   echo "**** configure php and nginx for nextcloud ****" && \
-  echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
-  echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
+  echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
     -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
@@ -89,11 +77,12 @@ RUN \
     -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
     -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
     -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-      /etc/php7/php.ini && \
+    -e 's/output_buffering.*=.*/output_buffering=0/g' \
+      /etc/php8/php.ini && \
   sed -i \
     '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php7/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+      /etc/php8/php.ini && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
     NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -107,8 +96,6 @@ RUN \
     tar xvf /app/nextcloud.tar.bz2 -C \
       /tmp && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /tmp/*
 
@@ -116,5 +103,5 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 443
-VOLUME /config /data
+EXPOSE 80 443
+VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -12,18 +12,6 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
   LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies --upgrade \
-    autoconf \
-    automake \
-    file \
-    g++ \
-    gcc \
-    make \
-    php7-dev \
-    re2c \
-    samba-dev \
-    zlib-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
     curl \
@@ -31,52 +19,52 @@ RUN \
     gnu-libiconv \
     imagemagick \
     libxml2 \
-    php7-apcu \
-    php7-bcmath \
-    php7-bz2 \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-exif \
-    php7-fileinfo \
-    php7-ftp \
-    php7-gd \
-    php7-gmp \
-    php7-iconv \
-    php7-imagick \
-    php7-imap \
-    php7-intl \
-    php7-ldap \
-    php7-mcrypt \
-    php7-memcached \
-    php7-opcache \
-    php7-pcntl \
-    php7-pdo_mysql \
-    php7-pdo_pgsql \
-    php7-pdo_sqlite \
-    php7-pgsql \
-    php7-phar \
-    php7-posix \
-    php7-redis \
-    php7-sodium \
-    php7-sqlite3 \
-    php7-xmlreader \
-    php7-zip \
+    php8-apcu \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-mbstring \
+    php8-opcache \
+    php8-openssl \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-session \
+    php8-simplexml \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xml \
+    php8-xmlreader \
+    php8-xmlwriter \
+    php8-zip \
     samba-client \
     sudo \
     tar \
     unzip && \
-  echo "**** compile smbclient ****" && \
-  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
-  cd /tmp/smbclient && \
-  phpize7 && \
-  ./configure \
-    --with-php-config=/usr/bin/php-config7 && \
-  make && \
-  make install && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-smbclient && \
   echo "**** configure php and nginx for nextcloud ****" && \
-  echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
-  echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
+  echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
     -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
@@ -89,11 +77,12 @@ RUN \
     -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
     -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
     -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-      /etc/php7/php.ini && \
+    -e 's/output_buffering.*=.*/output_buffering=0/g' \
+      /etc/php8/php.ini && \
   sed -i \
     '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php7/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+      /etc/php8/php.ini && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
     NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -107,8 +96,6 @@ RUN \
     tar xvf /app/nextcloud.tar.bz2 -C \
       /tmp && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /tmp/*
 
@@ -116,5 +103,5 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 443
-VOLUME /config /data
+EXPOSE 80 443
+VOLUME /config

Jenkinsfile

@@ -56,7 +56,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -277,7 +277,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -710,7 +710,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -66,8 +66,7 @@ This image provides various versions that are available via tags. Please read th
 
 | Tag | Available | Description |
 | :----: | :----: |--- |
-| latest | ✅ | Stable Nextcloud releases (currently php7) |
-| php8 | ✅ | Experimental php8 based Nextcloud releases |
+| latest | ✅ | Stable Nextcloud releases |
 
 ## Application Setup
 
@@ -85,7 +84,7 @@ Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u
 
 If you are not customizing our default nginx configuration you will need to remove the file:
 ```
-/config/nginx/site-confs/default
+/config/nginx/site-confs/default.conf
 ```
 Then restart the container to replace it with the latest one. 
 
@@ -257,25 +256,27 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.10.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
+* **30.09.22:** - Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html
 * **21.05.22:** - Update version check endpoint.
 * **28.04.22:** - Increase OPCache interned strings buffered setting to 16.
-* **14.04.22:** - Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default` and restart the container). Fix LDAP connection.
+* **14.04.22:** - Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection.
 * **11.09.21:** - Rebasing to alpine 3.14
 * **21.03.21:** - Publish `php8` tag for testing.
-* **25.02.21:** - Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **25.02.21:** - Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **21.01.21:** - Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup.
-* **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **16.01.21:** - Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13).
-* **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **03.06.20:** - Rebasing to alpine 3.12
 * **03.06.20:** - Add php7-bcmath and php7-fileinfo
 * **31.05.20:** - Add aliases for occ and updater.phar
 * **31.03.20:** - Allow crontab to be user customized, fix logrotate.
-* **17.01.20:** - Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **17.01.20:** - Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **19.12.19:** - Rebasing to alpine 3.11.
-* **18.11.19:** - Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **18.11.19:** - Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **28.10.19:** - Change cronjob to run every 5 minutes.
-* **24.10.19:** - Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **24.10.19:** - Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
 * **14.07.19:** - Download nextcloud during build time.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

package_versions.txt

@@ -1,74 +1,73 @@
-alpine-baselayout-3.2.0-r16
-alpine-keys-2.4-r0
-alsa-lib-1.2.5-r2
-aom-libs-1.0.0-r3
-apache2-utils-2.4.53-r0
-apk-tools-2.12.7-r0
-apr-1.7.0-r0
-apr-util-1.6.1-r7
+alpine-baselayout-3.2.0-r18
+alpine-keys-2.4-r1
+alsa-lib-1.2.5.1-r1
+aom-libs-3.2.0-r0
+apache2-utils-2.4.54-r0
+apk-tools-2.12.7-r3
+apr-1.7.0-r1
+apr-util-1.6.1-r11
 argon2-libs-20190702-r1
 avahi-libs-0.8-r5
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r7
-c-client-2007f-r11
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
-cairo-1.16.0-r4
-cairo-gobject-1.16.0-r4
-coreutils-8.32-r2
-cups-libs-2.3.3-r2
-curl-7.79.1-r1
-dbus-libs-1.12.20-r2
-expat-2.4.7-r0
-ffmpeg-4.4.1-r0
-ffmpeg-libs-4.4.1-r0
+busybox-1.34.1-r7
+c-client-2007f-r13
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
+cairo-1.16.0-r5
+cairo-gobject-1.16.0-r5
+coreutils-9.0-r2
+cups-libs-2.3.3-r6
+curl-7.80.0-r5
+dbus-libs-1.12.24-r0
+expat-2.5.0-r0
+ffmpeg-4.4.1-r2
+ffmpeg-libs-4.4.1-r2
 fontconfig-2.13.1-r4
-freetype-2.10.4-r3
-fribidi-1.0.10-r0
-gdbm-1.19-r0
-gdk-pixbuf-2.42.6-r0
-ghostscript-9.54.0-r1
-git-2.32.1-r0
-glib-2.68.3-r0
+freetype-2.11.1-r2
+fribidi-1.0.11-r0
+gdbm-1.22-r0
+gdk-pixbuf-2.42.8-r0
+ghostscript-9.55.0-r0
+git-2.34.5-r0
+glib-2.70.1-r0
 gmp-6.2.1-r1
 gnu-libiconv-1.16-r0
-gnutls-3.7.1-r0
+gnutls-3.7.1-r1
 graphite2-1.3.14-r0
-harfbuzz-2.8.1-r0
-icu-libs-67.1-r2
-imagemagick-7.0.11.14-r1
-imagemagick-libs-7.0.11.14-r1
-jansson-2.13.1-r0
+harfbuzz-3.0.0-r2
+icu-libs-69.1-r1
+imagemagick-7.1.0.16-r0
+imagemagick-libs-7.1.0.16-r0
+jansson-2.14-r0
 jbig2dec-0.19-r0
 lame-3.100-r0
 lcms2-2.12-r1
-ldb-2.3.3-r0
+ldb-2.4.4-r0
 libacl-2.2.53-r0
-libarchive-3.5.3-r0
-libass-0.15.1-r0
-libattr-2.5.1-r0
+libarchive-3.6.1-r1
+libass-0.15.2-r0
+libattr-2.5.1-r1
 libblkid-2.37.4-r0
-libbsd-0.11.3-r0
+libbsd-0.11.3-r1
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcap-2.50-r0
-libcrypto1.1-1.1.1o-r0
-libcurl-7.79.1-r1
-libdav1d-0.9.0-r0
-libde265-1.0.8-r1
-libdrm-2.4.106-r0
-libedit-20210216.3.1-r0
-libffi-3.3-r2
-libgcc-10.3.1_git20210424-r2
-libgomp-10.3.1_git20210424-r2
-libheif-1.12.0-r0
+libcap-2.61-r0
+libcrypto1.1-1.1.1s-r1
+libcurl-7.80.0-r5
+libdav1d-0.9.2-r0
+libde265-1.0.8-r2
+libdrm-2.4.109-r0
+libedit-20210910.3.1-r0
+libffi-3.4.2-r1
+libgcc-10.3.1_git20211027-r0
+libgomp-10.3.1_git20211027-r0
+libheif-1.12.0-r2
 libice-1.0.10-r0
 libintl-0.21-r0
-libjpeg-turbo-2.1.0-r0
-libldap-2.4.58-r0
+libjpeg-turbo-2.1.2-r0
+libldap-2.6.2-r0
 libltdl-2.4.6-r7
-libmagic-5.40-r1
 libmcrypt-2.5.8-r9
 libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
@@ -76,141 +75,139 @@ libmount-2.37.4-r0
 libogg-1.3.5-r0
 libpciaccess-0.16-r0
 libpng-1.6.37-r1
-libpq-13.6-r0
+libpq-14.5-r0
 libproc-3.3.17-r0
-libressl3.3-libcrypto-3.3.6-r0
-libressl3.3-libssl-3.3.6-r0
-libretls-3.3.3p1-r3
-librsvg-2.50.4-r1
+libretls-3.3.4-r3
+librsvg-2.50.7-r1
 libsasl-2.1.28-r0
 libsm-1.2.3-r0
-libsmbclient-4.14.12-r0
+libsmbclient-4.15.13-r0
 libsodium-1.0.18-r0
-libsrt-1.4.2-r0
-libssh-0.9.6-r0
-libssl1.1-1.1.1o-r0
-libstdc++-10.3.1_git20210424-r2
-libtasn1-4.17.0-r0
+libsrt-1.4.2-r1
+libssh-0.9.6-r1
+libssl1.1-1.1.1s-r1
+libstdc++-10.3.1_git20211027-r0
+libtasn1-4.18.0-r1
 libtheora-1.1.1-r16
 libunistring-0.9.10-r1
 libuuid-2.37.4-r0
-libva-2.11.0-r0
+libva-2.13.0-r0
 libvdpau-1.4-r0
 libvorbis-1.3.7-r0
 libvpx-1.10.0-r0
-libwbclient-4.14.12-r0
-libwebp-1.2.0-r2
-libx11-1.7.2-r0
+libwbclient-4.15.13-r0
+libwebp-1.2.2-r0
+libx11-1.7.3.1-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
-libxft-2.3.3-r0
-libxml2-2.9.14-r0
+libxft-2.3.4-r0
+libxml2-2.9.14-r2
 libxpm-3.5.13-r0
 libxrender-0.9.10-r3
 libxt-1.2.1-r0
-libzip-1.7.3-r2
-linux-pam-1.5.1-r1
-lmdb-0.9.29-r0
-logrotate-3.18.1-r1
+libzip-1.8.0-r1
+linux-pam-1.5.2-r0
+lmdb-0.9.29-r1
+logrotate-3.18.1-r4
 lz4-libs-1.9.3-r1
-musl-1.2.2-r3
-musl-utils-1.2.2-r3
-nano-5.7-r2
-ncurses-libs-6.2_p20210612-r0
-ncurses-terminfo-base-6.2_p20210612-r0
+musl-1.2.2-r7
+musl-utils-1.2.2-r7
+nano-5.9-r0
+ncurses-libs-6.3_p20211120-r1
+ncurses-terminfo-base-6.3_p20211120-r1
 nettle-3.7.3-r0
-nghttp2-libs-1.43.0-r0
+nghttp2-libs-1.46.0-r0
 nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1o-r0
+openssl-1.1.1s-r1
 opus-1.3.1-r1
-p11-kit-0.23.22-r0
-pango-1.48.5-r0
-pcre-8.44-r0
-pcre2-10.36-r0
-php7-7.4.26-r0
-php7-bcmath-7.4.26-r0
-php7-bz2-7.4.26-r0
-php7-common-7.4.26-r0
-php7-ctype-7.4.26-r0
-php7-curl-7.4.26-r0
-php7-dom-7.4.26-r0
-php7-exif-7.4.26-r0
-php7-fileinfo-7.4.26-r0
-php7-fpm-7.4.26-r0
-php7-ftp-7.4.26-r0
-php7-gd-7.4.26-r0
-php7-gmp-7.4.26-r0
-php7-iconv-7.4.26-r0
-php7-imap-7.4.26-r0
-php7-intl-7.4.26-r0
-php7-json-7.4.26-r0
-php7-ldap-7.4.26-r0
-php7-mbstring-7.4.26-r0
-php7-mysqlnd-7.4.26-r0
-php7-opcache-7.4.26-r0
-php7-openssl-7.4.26-r0
-php7-pcntl-7.4.26-r0
-php7-pdo-7.4.26-r0
-php7-pdo_mysql-7.4.26-r0
-php7-pdo_pgsql-7.4.26-r0
-php7-pdo_sqlite-7.4.26-r0
-php7-pecl-apcu-5.1.21-r0
-php7-pecl-igbinary-3.2.6-r0
-php7-pecl-imagick-3.5.0-r1
-php7-pecl-mcrypt-1.0.4-r0
-php7-pecl-memcached-3.1.5-r2
-php7-pecl-redis-5.3.4-r0
-php7-pgsql-7.4.26-r0
-php7-phar-7.4.26-r0
-php7-posix-7.4.26-r0
-php7-session-7.4.26-r0
-php7-simplexml-7.4.26-r0
-php7-sodium-7.4.26-r0
-php7-sqlite3-7.4.26-r0
-php7-xml-7.4.26-r0
-php7-xmlreader-7.4.26-r0
-php7-xmlwriter-7.4.26-r0
-php7-zip-7.4.26-r0
-pixman-0.40.0-r2
-pkgconf-1.7.4-r0
+p11-kit-0.24.0-r1
+pango-1.48.10-r0
+pcre-8.45-r1
+pcre2-10.40-r0
+php8-8.0.25-r0
+php8-bcmath-8.0.25-r0
+php8-bz2-8.0.25-r0
+php8-common-8.0.25-r0
+php8-ctype-8.0.25-r0
+php8-curl-8.0.25-r0
+php8-dom-8.0.25-r0
+php8-exif-8.0.25-r0
+php8-fileinfo-8.0.25-r0
+php8-fpm-8.0.25-r0
+php8-ftp-8.0.25-r0
+php8-gd-8.0.25-r0
+php8-gmp-8.0.25-r0
+php8-iconv-8.0.25-r0
+php8-imap-8.0.25-r0
+php8-intl-8.0.25-r0
+php8-ldap-8.0.25-r0
+php8-mbstring-8.0.25-r0
+php8-mysqlnd-8.0.25-r0
+php8-opcache-8.0.25-r0
+php8-openssl-8.0.25-r0
+php8-pcntl-8.0.25-r0
+php8-pdo-8.0.25-r0
+php8-pdo_mysql-8.0.25-r0
+php8-pdo_pgsql-8.0.25-r0
+php8-pdo_sqlite-8.0.25-r0
+php8-pecl-apcu-5.1.21-r0
+php8-pecl-igbinary-3.2.6-r0
+php8-pecl-imagick-3.6.0-r0
+php8-pecl-mcrypt-1.0.4-r0
+php8-pecl-memcached-3.1.5-r1
+php8-pecl-redis-5.3.6-r0
+php8-pecl-smbclient-1.0.6-r0
+php8-pgsql-8.0.25-r0
+php8-phar-8.0.25-r0
+php8-posix-8.0.25-r0
+php8-session-8.0.25-r0
+php8-simplexml-8.0.25-r0
+php8-sodium-8.0.25-r0
+php8-sqlite3-8.0.25-r0
+php8-xml-8.0.25-r0
+php8-xmlreader-8.0.25-r0
+php8-xmlwriter-8.0.25-r0
+php8-zip-8.0.25-r0
+pixman-0.40.0-r4
+pkgconf-1.8.0-r0
 popt-1.18-r0
 procps-3.3.17-r0
-readline-8.1.0-r0
-s6-ipcserver-2.10.0.3-r0
-samba-client-4.14.12-r0
-samba-client-libs-4.14.12-r0
-samba-common-4.14.12-r0
-samba-libs-4.14.12-r0
-samba-util-libs-4.14.12-r0
-scanelf-1.3.2-r0
-sdl2-2.0.14-r1
-shadow-4.8.1-r0
-shared-mime-info-2.1-r0
-skalibs-2.10.0.3-r0
+readline-8.1.1-r0
+s6-ipcserver-2.11.0.0-r0
+samba-client-4.15.13-r0
+samba-client-libs-4.15.13-r0
+samba-common-4.15.13-r0
+samba-libs-4.15.13-r0
+samba-util-libs-4.15.13-r0
+scanelf-1.3.3-r0
+sdl2-2.0.16-r4
+shadow-4.8.1-r1
+shared-mime-info-2.1-r1
+skalibs-2.11.0.0-r0
 soxr-0.1.3-r2
-sqlite-libs-3.35.5-r0
-ssl_client-1.33.1-r7
-sudo-1.9.7_p1-r1
-talloc-2.3.2-r1
+sqlite-libs-3.36.0-r0
+ssl_client-1.34.1-r7
+sudo-1.9.12-r1
+talloc-2.3.3-r0
 tar-1.34-r0
-tdb-libs-1.4.3-r1
-tevent-0.10.2-r1
-tiff-4.3.0-r0
-tzdata-2022a-r0
+tdb-libs-1.4.5-r0
+tevent-0.11.0-r0
+tiff-4.4.0-r0
+tzdata-2022f-r1
 unzip-6.0-r9
-utmps-0.1.0.2-r0
-v4l-utils-libs-1.20.0-r0
+utmps-0.1.0.3-r0
+v4l-utils-libs-1.22.1-r1
 vidstab-1.1.0-r1
-vulkan-loader-1.2.170-r1
-wayland-libs-client-1.19.0-r0
-x264-libs-20210211-r0
-x265-libs-3.4-r0
+vulkan-loader-1.2.196-r0
+wayland-libs-client-1.19.0-r1
+x264-libs-20210613-r0
+x265-libs-3.5-r0
 xvidcore-1.3.7-r1
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r1
-zstd-libs-1.4.9-r1
+zlib-1.2.12-r3
+zstd-libs-1.5.0-r0

readme-vars.yml

@@ -20,8 +20,7 @@ available_architectures:
 # development version
 development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable Nextcloud releases (currently php7)" }
-  - { tag: "php8", desc: "Experimental php8 based Nextcloud releases" }
+  - { tag: "latest", desc: "Stable Nextcloud releases" }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -65,7 +64,7 @@ app_setup_block: |
   
   If you are not customizing our default nginx configuration you will need to remove the file:
   ```
-  /config/nginx/site-confs/default
+  /config/nginx/site-confs/default.conf
   ```
   Then restart the container to replace it with the latest one. 
 
@@ -78,25 +77,27 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "10.10.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
+  - { date: "30.09.22:", desc: "Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html" }
   - { date: "21.05.22:", desc: "Update version check endpoint." }
   - { date: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16." }
-  - { date: "14.04.22:", desc: "Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default` and restart the container). Fix LDAP connection." }
+  - { date: "14.04.22:", desc: "Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection." }
   - { date: "11.09.21:", desc: "Rebasing to alpine 3.14" }
   - { date: "21.03.21:", desc: "Publish `php8` tag for testing." }
-  - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup." }
-  - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." }
-  - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" }
   - { date: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo" }
   - { date: "31.05.20:", desc: "Add aliases for occ and updater.phar" }
   - { date: "31.03.20:", desc: "Allow crontab to be user customized, fix logrotate." }
-  - { date: "17.01.20:", desc: "Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "17.01.20:", desc: "Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
-  - { date: "18.11.19:", desc: "Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "18.11.19:", desc: "Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "28.10.19:", desc: "Change cronjob to run every 5 minutes." }
-  - { date: "24.10.19:", desc: "Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "24.10.19:", desc: "Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
   - { date: "14.07.19:", desc: "Download nextcloud during build time." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

root/defaults/nextcloud-perms.sh

@@ -26,13 +26,11 @@ chown -R ${htuser}:${htgroup} ${ocpath}/updater/
 chmod +x ${ocpath}/occ
 
 printf "chmod/chown .htaccess\n"
-if [ -f ${ocpath}/.htaccess ]
- then
-  chmod 0644 ${ocpath}/.htaccess
-  chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
+if [ -f ${ocpath}/.htaccess ]; then
+    chmod 0644 ${ocpath}/.htaccess
+    chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
 fi
-if [ -f ${ocpath}/data/.htaccess ]
- then
-  chmod 0644 ${ocpath}/data/.htaccess
-  chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
+if [ -f ${ocpath}/data/.htaccess ]; then
+    chmod 0644 ${ocpath}/data/.htaccess
+    chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
 fi

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,31 +1,29 @@
-upstream php-handler {
-    server 127.0.0.1:9000;
-}
-server {
-    listen 80;
-    listen [::]:80;
-    server_name _;
-    return 301 https://$host$request_uri;
-}
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name _;
-    ssl_certificate /config/keys/cert.crt;
-    ssl_certificate_key /config/keys/cert.key;
+## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
-    # Add headers to serve security related headers
-    # Before enabling Strict-Transport-Security headers please read into this
-    # topic first.
-    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-    #
-    # WARNING: Only add the preload option once you read about
-    # the consequences in https://hstspreload.org/. This option
-    # will add the domain to a hardcoded list that is shipped
-    # in all major browsers and getting removed from this list
-    # could take several months.
+# Set the `immutable` cache control options only for assets with a cache busting `v` argument
+map $arg_v $asset_immutable {
+    "" "";
+    default "immutable";
+}
 
-    # set max upload size
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl http2 default_server;
+
+    server_name _;
+
+    root /config/www/nextcloud/;
+
+    # display real ip in nginx logs when connected through reverse proxy via docker network
+    set_real_ip_from 172.0.0.0/8;
+    real_ip_header X-Forwarded-For;
+
+    # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html#nextcloud-in-the-webroot-of-nginx
+
+    # set max upload size and increase upload timeout:
     client_max_body_size 512M;
     client_body_timeout 300s;
     fastcgi_buffers 64 4K;
@@ -38,6 +36,15 @@ server {
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
     gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
+    # Pagespeed is not supported by Nextcloud, so if your server is built
+    # with the `ngx_pagespeed` module, uncomment this line to disable it.
+    #pagespeed off;
+
+    # The settings allows you to optimize the HTTP2 bandwitdth.
+    # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
+    # for tunning hints
+    client_body_buffer_size 512k;
+
     # HTTP response headers borrowed from Nextcloud `.htaccess`
     add_header Referrer-Policy                      "no-referrer"   always;
     add_header X-Content-Type-Options               "nosniff"       always;
@@ -50,12 +57,6 @@ server {
     # Remove X-Powered-By, which is an information leak
     fastcgi_hide_header X-Powered-By;
 
-    root /config/www/nextcloud/;
-
-    # display real ip in nginx logs when connected through reverse proxy via docker network
-    set_real_ip_from 172.0.0.0/8;
-    real_ip_header X-Forwarded-For;
-
     # Specify how to handle directories -- specifying `/index.php$request_uri`
     # here as the fallback means that Nginx always exhibits the desired behaviour
     # when a client requests a path that corresponds to a directory that exists
@@ -120,11 +121,10 @@ server {
         include /etc/nginx/fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $path_info;
-        fastcgi_param HTTPS on;
 
         fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
         fastcgi_param front_controller_active true;     # Enable pretty urls
-        fastcgi_pass php-handler;
+        fastcgi_pass 127.0.0.1:9000;
 
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
@@ -134,7 +134,7 @@ server {
 
     location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
         try_files $uri /index.php$request_uri;
-        expires 6M;         # Cache-Control policy borrowed from `.htaccess`
+        add_header Cache-Control "public, max-age=15778463, $asset_immutable";
         access_log off;     # Optional: Don't log access to assets
 
         location ~ \.wasm$ {
@@ -154,7 +154,15 @@ server {
     }
 
     location / {
+        # enable for basic auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
         try_files $uri $uri/ /index.php$request_uri;
     }
 
+    # deny access to .htaccess/.htpasswd files
+    location ~ /\.ht {
+        deny all;
+    }
 }

root/etc/cont-init.d/40-config

@@ -1,8 +1,14 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# folders
+mkdir -p \
+    /config \
+    /data
 
 # permissions
 chown abc:abc \
-	/config \
-	/data
-chown -R abc:abc  \
-	/var/lib/nginx
+    /config \
+    /data
+chown -R abc:abc \
+    /var/lib/nginx

root/etc/cont-init.d/50-install

@@ -1,20 +1,28 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # create folders
 mkdir -p \
-	"${NEXTCLOUD_PATH}" \
-	/config/crontabs
+    "${NEXTCLOUD_PATH}" \
+    /config/crontabs
 
 # install app
 if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
-	tar xf /app/nextcloud.tar.bz2 -C \
-		"${NEXTCLOUD_PATH}" --strip-components=1
-	chown abc:abc -R \
-		"${NEXTCLOUD_PATH}"
-	chmod +x "${NEXTCLOUD_PATH}/occ"
+    tar xf /app/nextcloud.tar.bz2 -C \
+        "${NEXTCLOUD_PATH}" --strip-components=1
+    chown abc:abc -R \
+        "${NEXTCLOUD_PATH}"
+    chmod +x "${NEXTCLOUD_PATH}/occ"
 fi
 
-# set cronjob
-[[ ! -f /config/crontabs/root ]] && \
-	cp /defaults/root /config/crontabs/root
-cp /config/crontabs/root /etc/crontabs/root
+# copy crontab if needed
+if [[ ! -f /config/crontabs/root ]]; then
+    cp /etc/crontabs/root /config/crontabs/
+fi
+
+sed -i "s|s6-setuidgid abc php[78] -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|" /config/crontabs/root
+
+# import user crontabs
+rm /etc/crontabs/*
+cp /config/crontabs/* /etc/crontabs/
+

root/etc/cont-init.d/60-memcache

@@ -1,9 +1,11 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # copy config
-[[ ! -f /config/www/nextcloud/config/config.php ]] && \
-	cp /defaults/config.php /config/www/nextcloud/config/config.php
+if [[ ! -f /config/www/nextcloud/config/config.php ]]; then
+    cp /defaults/config.php /config/www/nextcloud/config/config.php
+fi
 
 # permissions
 chown abc:abc \
-	/config/www/nextcloud/config/config.php
+    /config/www/nextcloud/config/config.php

root/etc/cont-init.d/70-aliases

@@ -1,20 +1,25 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 ## Set alias for occ and make executable
-[[ ! -f /usr/bin/occ ]] && \
-  echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php7 /config/www/nextcloud/occ $*"' > /usr/bin/occ
+if [[ ! -f /usr/bin/occ ]]; then
+    echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php /config/www/nextcloud/occ $*"' >/usr/bin/occ
+fi
 
-[[ ! -x /usr/bin/occ ]] && \
-  chmod +x /usr/bin/occ
+if [[ ! -x /usr/bin/occ ]]; then
+    chmod +x /usr/bin/occ
+fi
 
 ## Set alias for updater.phar and make executable
-[[ ! -f /usr/bin/updater.phar ]] && \
-  echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php7 /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar
-
-[[ ! -x /usr/bin/updater.phar ]] && \
-  chmod +x /usr/bin/updater.phar
-
-if ( occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
-  echo "Removing CODE Server" 
-  occ app:remove --no-interaction richdocumentscode 2>/dev/null 
+if [[ ! -f /usr/bin/updater.phar ]]; then
+    echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php /config/www/nextcloud/updater/updater.phar $*"' >/usr/bin/updater.phar
+fi
+
+if [[ ! -x /usr/bin/updater.phar ]]; then
+    chmod +x /usr/bin/updater.phar
+fi
+
+if (occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
+    echo "Removing CODE Server"
+    occ app:remove --no-interaction richdocumentscode 2>/dev/null
 fi

root/etc/crontabs/root

@@ -6,4 +6,4 @@
 0       3       *       *       6       run-parts /etc/periodic/weekly
 0       5       1       *       *       run-parts /etc/periodic/monthly
 # nextcloud cron
-*/5     *       *       *       *       s6-setuidgid abc php7 -f /config/www/nextcloud/cron.php
+*/5     *       *       *       *       s6-setuidgid abc php -f /config/www/nextcloud/cron.php

root/etc/services.d/cron/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-/usr/sbin/crond -f -S -l 0 -c /etc/crontabs