Merge 40b2779cfb into 2334b3e231

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.

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on:
   workflow_dispatch:
   push:
-    branches: [ version-27 ]
+    branches: [ master ]
   schedule:
     # Build the image regularly (each Friday)
     - cron: '23 04 * * 5'
@@ -34,7 +34,7 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@main
         with:
-          cosign-release: 'v2.2.2'
+          cosign-release: 'v1.13.1'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -53,6 +53,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
+            latest
             ${{ env.FULL_VERSION }}
             ${{ env.MAJOR_VERSION }}
 
@@ -69,4 +70,4 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         env:
           COSIGN_EXPERIMENTAL: "true"
-        run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
+        run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}

Dockerfile

@@ -1,5 +1,5 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=27.1.11
+ARG NEXTCLOUD_VERSION=27.1.3
 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.11.tar.bz2
+# nextcloud-27.1.3.tar.bz2
-ARG SHA256_SUM="4edd2570f4c83442f8f0f0616fb774ed2663b11cf9f6ea49e795ab43aeef9645"
+ARG SHA256_SUM="1d614935245e4a375b4ac991c02f323592b753972f86f88763fd80ed7d275793"
 
 # Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
 ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

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)