Merge 40b2779cfbbf0e4614c5ee81bb47c42ec789235e into 1ee6c08552e3fc0ba1dfdcdac0604f86eab04d8c

Checking for a available database when installing is fine, but running
occ upgrade without a db available is also a problem. This checks for db
availability in every case.

Dockerfile

@@ -1,5 +1,5 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=27.1.4
+ARG NEXTCLOUD_VERSION=28.0.0
 ARG PHP_VERSION=8.2
 ARG NGINX_VERSION=1.24
 
@@ -10,8 +10,8 @@ ARG SNUFFLEUPAGUS_VERSION=0.10.0
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-27.1.4.tar.bz2
-ARG SHA256_SUM="bec65f2166b82c9303baf476c1e424f71aa196dad010ffe4c0c39d03990d594c"
+# nextcloud-28.0.0.tar.bz2
+ARG SHA256_SUM="4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2"
 
 # Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
 ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
@@ -58,6 +58,7 @@ RUN apk -U upgrade \
         bcmath \
         exif \
         gd \
+        bz2 \
         intl \
         ldap \
         opcache \

README.md

@@ -58,8 +58,8 @@ Verifying the signature isn't a requirement, and might not be as seamless as usi
 ## Tags
 
 - `latest` : latest Nextcloud version
-- `x` : latest Nextcloud x.x (e.g. `25`)
-- `x.x.x` : Nextcloud x.x.x (e.g. `25.0.0`)
+- `x` : latest Nextcloud x.x (e.g. `28`)
+- `x.x.x` : Nextcloud x.x.x (e.g. `28.0.0`)
 
 You can always have a glance [here](https://github.com/users/hoellen/packages/container/package/nextcloud).
 Only the **latest stable version** will be maintained by myself.

SECURITY.md

@@ -7,12 +7,16 @@ and will receive the minor version updates and security patches.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 25. x   | :white_check_mark: |
-| 24. x   | :white_check_mark: |
+| 28. x   | :white_check_mark: |
+| 27. x   | :white_check_mark: |
+| 26. x   | :white_check_mark: |
+| 25. x   | :negative_squared_cross_mark: |
+| 24. x   | :negative_squared_cross_mark: |
 | 23. x   | :negative_squared_cross_mark: |
 | 22. x   | :negative_squared_cross_mark: |
 
 Please update to the latest version available. Major migrations are always tested before being pushed.
+An up-to-date list of the currently maintained Nextcloud versions can also be found in the [Nextcloud Repository Wiki](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule).
 
 ## Automated vulnerability scanning
 

rootfs/usr/local/bin/run.sh

@@ -15,6 +15,15 @@ if [ "$PHP_HARDENING" == "true" ] && [ ! -f /usr/local/etc/php/conf.d/snuffleupa
     cp /usr/local/etc/php/snuffleupagus/* /usr/local/etc/php/conf.d
 fi
 
+# Check if database is available
+if [ ${DB_TYPE} != "sqlite3" ]; then
+  until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
+  do
+    echo "waiting for the database container..."
+    sleep 1
+  done
+fi
+
 # If new install, run setup
 if [ ! -f /nextcloud/config/config.php ]; then
     touch /nextcloud/config/CAN_INSTALL

rootfs/usr/local/bin/setup.sh

@@ -55,14 +55,6 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
 ?>
 EOF
 
-if [ ${DB_TYPE} != "sqlite3" ]; then
-  until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
-  do
-    echo "waiting for the database container..."
-    sleep 1
-  done
-fi
-
 echo "Starting automatic configuration..."
 # Execute setup
 (cd /nextcloud; php index.php &>/dev/null)