Fix bootstrap flow when Nextcloud install fails

.docker/bin/test-e2e

@@ -10,7 +10,7 @@ elif [ -n "$1" ] && [ -d "volumes/nextcloud/$1" ]; then
     APP_PATH="volumes/nextcloud/$1"
     shift
 elif [ -n "$APP_PATH" ]; then
-    APP_PATH="$APP_PATH"
+    :
 elif [ -f "package.json" ] && [ -f "appinfo/info.xml" ]; then
     # We're inside an app directory
     APP_PATH="."
@@ -49,7 +49,6 @@ else
     fi
 fi
 
-CONTAINER="nextcloud-playwright"
 WORKSPACE="/var/www/html/$RELATIVE_PATH"
 
 GREEN='\033[0;32m'

.docker/bin/test-e2e-headed

@@ -9,7 +9,7 @@ elif [ -n "$1" ] && [ -d "volumes/nextcloud/$1" ]; then
     APP_PATH="volumes/nextcloud/$1"
     shift
 elif [ -n "$APP_PATH" ]; then
-    APP_PATH="$APP_PATH"
+    :
 elif [ -f "package.json" ] && [ -f "appinfo/info.xml" ]; then
     APP_PATH="."
 else

.docker/bin/test-e2e-report

@@ -10,7 +10,7 @@ elif [ -n "$1" ] && [ -d "volumes/nextcloud/$1" ]; then
     APP_PATH="volumes/nextcloud/$1"
     shift
 elif [ -n "$APP_PATH" ]; then
-    APP_PATH="$APP_PATH"
+    :
 elif [ -f "package.json" ] && [ -f "appinfo/info.xml" ]; then
     # We're inside an app directory
     APP_PATH="."

.docker/bin/test-e2e-ui

@@ -9,7 +9,7 @@ elif [ -n "$1" ] && [ -d "volumes/nextcloud/$1" ]; then
     APP_PATH="volumes/nextcloud/$1"
     shift
 elif [ -n "$APP_PATH" ]; then
-    APP_PATH="$APP_PATH"
+    :
 elif [ -f "package.json" ] && [ -f "appinfo/info.xml" ]; then
     APP_PATH="."
 else

.docker/bin/trust-local-cert

@@ -2,7 +2,7 @@
 
 set -eu
 
-ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")/../.." && pwd)
+ROOT_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")/../.." && pwd)
 cd "$ROOT_DIR"
 
 container_id=$(docker compose ps -q nginx)

.docker/scripts/entrypoint.sh

@@ -22,16 +22,34 @@ mkdir -p apps-extra
 # Wait for database
 php /var/www/scripts/wait-for-db.php
 
+install_cmd_status=0
+
 # Set configurations, if needed
 if [[ ! -f "config/config.php" && ${AUTOINSTALL} -eq 1 ]]; then
     echo "⌛️ Starting installation ..."
     chown -R www-data:www-data .
     if [[ ${DB_HOST} == 'mysql' ]]; then
         occ maintenance:install --verbose --database="${DB_HOST}" --database-name="${MYSQL_DATABASE}" --database-host="${DB_HOST}" --database-port= --database-user="${MYSQL_USER}" --database-pass="${MYSQL_PASSWORD}" --admin-user="${NEXTCLOUD_ADMIN_USER}" --admin-pass="${NEXTCLOUD_ADMIN_PASSWORD}" --admin-email="${NEXTCLOUD_ADMIN_EMAIL}"
+        install_cmd_status=$?
     elif [[ "${DB_HOST}" == 'pgsql' ]]; then
         occ maintenance:install --verbose --database="${DB_HOST}" --database-name="${POSTGRES_DB}" --database-host="${DB_HOST}" --database-port= --database-user="${POSTGRES_USER}" --database-pass="${POSTGRES_PASSWORD}" --admin-user="${NEXTCLOUD_ADMIN_USER}" --admin-pass="${NEXTCLOUD_ADMIN_PASSWORD}" --admin-email="${NEXTCLOUD_ADMIN_EMAIL}"
+        install_cmd_status=$?
     else
         occ maintenance:install --verbose --admin-user="${NEXTCLOUD_ADMIN_USER}" --admin-pass="${NEXTCLOUD_ADMIN_PASSWORD}" --admin-email="${NEXTCLOUD_ADMIN_EMAIL}"
+        install_cmd_status=$?
+    fi
+
+    if [[ ${install_cmd_status} -ne 0 ]]; then
+        db_reset_hint="volumes/nextcloud/config and volumes/nextcloud/data"
+        if [[ ${DB_HOST} == 'mysql' ]]; then
+            db_reset_hint="volumes/mysql/data, ${db_reset_hint}"
+        elif [[ ${DB_HOST} == 'pgsql' ]]; then
+            db_reset_hint="volumes/postgres/data, ${db_reset_hint}"
+        fi
+
+        echo "❌ Installation failed. Check the logs above for the exact reason."
+        echo "   If this is a local reset issue, remove: ${db_reset_hint}"
+        exit ${install_cmd_status}
     fi
 
     echo "🔧 Making initial config ..."
@@ -111,6 +129,11 @@ EOF
     echo "🥳 Setup completed !!!"
 fi
 
+if ! occ status | grep -q 'installed: true'; then
+    echo "❌ Nextcloud is not installed. Skipping startup tasks and stopping container."
+    exit 1
+fi
+
 # Run cron
 echo "📅 Running cron for the first time ..."
 exec busybox crond -f -l 0 -L /dev/stdout > /dev/null 2>&1 &

.github/workflows/docker-nginx.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 concurrency:
-  group: push-to-registry-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/docker-php.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 concurrency:
-  group: push-to-registry-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

docs/faq.md

@@ -5,7 +5,7 @@
 ### Reset entire setup?
 
 - Go down the containers
-- Remove the folder volumes
+- Remove persisted volumes (`volumes/mysql/data`, `volumes/nextcloud/config` and `volumes/nextcloud/data`) or remove the entire `volumes` folder
 - Go up the containers
 
 This will delete the database and Nextcloud volumes. Before do a backup of all that you don't want to lost, by example `volumes/nextcloud/config/config.php`