PHP 8.3 install mysql module

docker/init

@@ -31,17 +31,6 @@ function nginx_start() {
 	fi
 }
 
-function wait_for_db() {
-	# Wait for DB to be active
-	if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
-		while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
-			echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
-			sleep 1;
-		done
-		echo "- DB is active on ${DB_HOST}:${DB_PORT}"
-	fi
-}
-
 # Run any container setup
 [ -x /sbin/init-container ] && /sbin/init-container
 
@@ -52,7 +41,12 @@ if [ -x /usr/bin/memcached -a "${MEMCACHED_START}" == "TRUE" ]; then
 fi
 
 # Laravel Specific
-if [ -r artisan -a -e ${php}/.env ]; then
+if [ "${role}" = "app" -a -e artisan ]; then
+	if [ ! -e ${php}/.env ]; then
+		echo "! ERROR: NO .env file..."
+		exec /bin/bash
+	fi
+
 	mp=$(mp ${php})
 
 	# Only adjust perms if this is an external mountpoint
@@ -72,6 +66,7 @@ if [ -r artisan -a -e ${php}/.env ]; then
 		fi
 	fi
 
+	if [ "${env}" != "local" -a -r "artisan" ]; then
 		# See if we need to refresh our dependancies
 		if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
 			echo "* Composer installing dependancies..."
@@ -94,25 +89,25 @@ if [ -r artisan -a -e ${php}/.env ]; then
 		fi
 
 		if [ -e .lumen ]; then
-		echo "* Lumen detected, not caching configuration..."
+			echo "* Lumen detected..."
 		else
-		# We only check for non mount points, in case this container has the app inside
-		mp=$(mp ${php})
-		if [ ${mp} -eq 1 ]; then
 			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan optimize)"
+			su www-data -s /bin/sh -c "(php artisan optimize && php artisan view:cache)"
-		fi
 		fi
 
-	if [ "${role}" = "app" ]; then
-		if [ "${env}" != "local" ]; then
 		if [ -z "${IGNORE_MIGRATION}" ]; then
 			if [ -r .migrate ]; then
 				echo "* Running migration..."
 				# If DB_HOST not set, source the env file
 				[ -z "${DB_HOST}" -a -r .env ] && . .env
 
-					wait_for_db
+				if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
+					while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
+						echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
+						sleep 1;
+					done
+					echo "- DB is active on ${DB_HOST}:${DB_PORT}"
+				fi
 
 				su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
 			fi
@@ -143,36 +138,65 @@ if [ -r artisan -a -e ${php}/.env ]; then
 
 	exec /usr/local/bin/docker-php-entrypoint "$@"
 
-	elif [ "$role" = "queue" ]; then
+elif [ "$role" = "queue" -a -e artisan ]; then
-		QUEUE_CMD=work
+	if [ ! -e ${php}/.env ]; then
+		echo "! ERROR: NO .env file..."
+		exec /bin/bash
+	fi
 
+	QUEUE_CMD=work
 	if [ "${env}" == "local" ]; then
 		QUEUE_CMD=listen
 	fi
 
+	if [ -e .lumen ]; then
+		echo "* Lumen detected..."
+	else
+		# We only check for non mount points, in case this container has the app inside
+		mp=$(mp ${php})
+		if [ ${mp} -eq 1 ]; then
+			echo "* Caching configuration..."
+			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
+		fi
+	fi
+
 	echo "* Running the queue..."
 	# We'll delay starting in case the app is caching
 	sleep 15
 
-		wait_for_db
-
 	su www-data -s /bin/sh -c "
 	while true; do
 		php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
 	done
 	"
 
-	elif [ "$role" = "scheduler" ]; then
+elif [ "$role" = "scheduler" -a -e artisan ]; then
+	if [ ! -e ${php}/.env ]; then
+		echo "! ERROR: NO .env file..."
+		exec /bin/bash
+	fi
+
+	if [ -e .lumen ]; then
+		echo "* Lumen detected..."
+	else
+		# We only check for non mount points, in case this container has the app inside
+		mp=$(mp ${php})
+		if [ ${mp} -eq 1 ]; then
+			echo "* Caching configuration..."
+			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
+		fi
+	fi
+
 	echo "* Running the scheduler..."
 	# We'll delay starting in case the app is caching
 	sleep 15
 
 	su www-data -s /bin/sh -c "
 	while true; do
-			php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction
+		(php ${PHP_OPTIONS} artisan schedule:run --verbose --no-interaction &)
+		sleep 60
 	done
 	"
-	fi
 
 else
 	nginx_start