PHP 8.3 install postgres module

docker/init

@@ -41,12 +41,7 @@ if [ -x /usr/bin/memcached -a "${MEMCACHED_START}" == "TRUE" ]; then
 fi
 
 # Laravel Specific
-if [ "${role}" = "app" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
+if [ -r artisan -a -e ${php}/.env ]; then
 	mp=$(mp ${php})
 
 	# Only adjust perms if this is an external mountpoint
@@ -66,7 +61,6 @@ if [ "${role}" = "app" -a -e artisan ]; 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..."
@@ -89,12 +83,18 @@ if [ "${role}" = "app" -a -e artisan ]; then
 	fi
 
 	if [ -e .lumen ]; then
-			echo "* Lumen detected..."
+		echo "* Lumen detected, not caching configuration..."
 	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 && php artisan view:cache)"
+			su www-data -s /bin/sh -c "(php artisan optimize)"
+		fi
 	fi
 
+	if [ "${role}" = "app" ]; then
+		if [ "${env}" != "local" ]; then
 			if [ -z "${IGNORE_MIGRATION}" ]; then
 				if [ -r .migrate ]; then
 					echo "* Running migration..."
@@ -138,28 +138,13 @@ if [ "${role}" = "app" -a -e artisan ]; then
 
 		exec /usr/local/bin/docker-php-entrypoint "$@"
 
-elif [ "$role" = "queue" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
+	elif [ "$role" = "queue" ]; then
 		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
@@ -170,33 +155,17 @@ elif [ "$role" = "queue" -a -e artisan ]; then
 		done
 		"
 
-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
-
+	elif [ "$role" = "scheduler" ]; then
 		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:run --verbose --no-interaction &)
-		sleep 60
+			(php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction &)
 		done
 		"
+	fi
 
 else
 	nginx_start