feat: updated logic in nextcloud push entrypoint file to check socket via curl

nextcloud/nextcloud-entrypoint.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+set -eu
+
+####################
+# My Special Sauce #
+####################
+#################################################################
+# This script is to make the www-data in /entrypoint.sh to	#
+# any user specified by $PUID environment variable,		#
+# so that your nextcloud can run or update properly.		#
+#################################################################
+
+# default to UID=1000 if not set
+TARGET_UID="${PUID:-1000}"
+
+# Overwrite /usr/local/etc/php-fpm.d/zz-docker.conf to make php-fpm listen on unix socket
+cat <<EOF >/usr/local/etc/php-fpm.d/zz-docker.conf
+; Generated by /nextcloud-entrypoint.sh
+; DO NOT EDIT THIS FILE, IT WILL BE OVERWRITTEN !!
+; please make changes in the /nextcloud-entrypoint.sh script
+[global]
+daemonize = no
+
+[www]
+access.log = /tmp/fpm-access.log
+listen = ${NEXTCLOUD_FPM_SOCK:-/tmp/docker/nextcloud-fpm.sock}
+
+listen.owner = ${TARGET_UID}
+listen.group = ${TARGET_UID}
+; Restricting socket to owner and group only
+listen.mode = 0660
+
+user = ${TARGET_UID}
+group = ${TARGET_UID}
+
+pm.max_children = 50
+pm.start_servers = 10
+pm.min_spare_servers = 5
+pm.max_spare_servers = 15
+pm.max_requests = 1000
+EOF
+
+# replace "www-data" with numeric $PUID in /entrypoint.sh
+sed -i "s/www-data/${TARGET_UID}/g" /entrypoint.sh
+
+# execute the patched entrypoint with all args
+exec /entrypoint.sh php-fpm

nextcloud/nextcloud-notify-push-entrypoint.sh

@@ -14,6 +14,11 @@ cleanup() {
 }
 trap 'cleanup' TERM INT
 
+while ! curl -s --fail --max-time 15 "$NEXTCLOUD_URL/status.php" >/dev/null; do
+	echo "[*] Waiting for Nextcloud to start..."
+	sleep 5
+done
+
 echo "[*] Ensuring notify_push app is installed and enabled..."
 php occ app:install notify_push || true
 php occ app:enable notify_push || true
@@ -22,16 +27,22 @@ echo "[*] Starting notify_push binary..."
 /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push &
 NOTIFY_PID=$!
 
-# Wait for the socket to appear, max 30 seconds
+# Wait for the socket to active and respond, max 30 seconds
 i=1
 while [ $i -le 6 ]; do
+	if [ -S "$SOCKET_PATH" ]; then
+		echo "[*] Socket file exists, testing HTTP response..."
+		if curl -s --max-time 5 --unix-socket "$SOCKET_PATH" http://localhost/ -o /dev/null; then
+			echo "[*] notify_push is ready, running occ notify_push:setup"
+			php occ notify_push:setup "${NEXTCLOUD_URL}/push" || true
+			break
+		else
+			echo "[!] Socket exists, but no HTTP response yet"
+		fi
+	fi
+
 	echo "[*] Waiting 5 seconds for notify_push to be ready... (try $i/6)"
 	sleep 5
-	if [ -S "$SOCKET_PATH" ]; then
-		echo "[*] Socket found, running occ notify_push:setup"
-		php occ notify_push:setup "${NEXTCLOUD_URL}/push" || true
-		break
-	fi
 	: $((i += 1))
 done
 

nextcloud/nextcloud.container

@@ -7,7 +7,7 @@ After=nextcloud_db.service nextcloud_valkey.service
 Pod=nextcloud.pod
 ContainerName=nextcloud
 Image=docker.io/library/nextcloud:fpm-alpine
-Entrypoint=["/bin/sh","-c","sed -i 's/www-data/1000/g' /entrypoint.sh && exec /entrypoint.sh php-fpm"]
+Entrypoint=/nextcloud-entrypoint.sh
 
 # Enable auto-update container
 AutoUpdate=registry
@@ -23,7 +23,6 @@ EnvironmentFile=./.env
 
 Volume=%h/podman/nextcloud/html:/var/www/html
 Volume=%h/nextcloud:/var/www/html/data
-Volume=./zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
 Volume=${EXTERNAL_DIR}:${EXTERNAL_DIR}
 Volume=./nextcloud-entrypoint.sh:/nextcloud-entrypoint.sh
 

nextcloud/zz-docker.conf

@@ -1,20 +0,0 @@
-[global]
-daemonize = no
-
-[www]
-access.log = /tmp/fpm-access.log
-listen = /tmp/docker/nextcloud-fpm.sock
-
-listen.owner = 1000
-listen.group = 1000
-listen.mode = 0777
-
-user = 1000
-group = 1000
-
-pm.max_children = 50
-pm.start_servers = 10
-pm.min_spare_servers = 5
-pm.max_spare_servers = 15
-pm.max_requests = 1000
-