fix: install scripts

Author: williarin

.editorconfig

@@ -20,3 +20,7 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 4

Makefile

@@ -0,0 +1,5 @@
+installer:
+	@docker build -f build/installer/Dockerfile -t ghcr.io/phpquant/stochastix-installer .
+
+app:
+	@docker build -f build/app.Dockerfile -t ghcr.io/phpquant/stochastix --target frankenphp_dev .

build/installer/install.sh

@@ -24,8 +24,7 @@ if [ -d "$PROJECT_PATH" ]; then
 fi
 
 echo "Creating new Stochastix project in './${PROJECT_NAME}'..."
-mkdir -p "$PROJECT_PATH"
-mkdir -p "$PROJECT_PATH/frankenphp"
+mkdir -p "$PROJECT_PATH/frankenphp/conf.d"
 
 # Copy the template files from the image into the new project directory
 echo "Scaffolding project files..."
@@ -37,13 +36,14 @@ cp /templates/frankenphp/Caddyfile "${PROJECT_PATH}/frankenphp/Caddyfile"
 cp /templates/frankenphp/conf.d/20-app.dev.ini "${PROJECT_PATH}/frankenphp/conf.d/20-app.dev.ini"
 
 echo "✅ Project files created."
-echo "🚀 Launching Stochastix application... (This may take a minute on the first run)"
+echo "🚀 Installing Stochastix... (This may take 3 to 10 minutes depending on your internet connection)"
 
 # Use the mounted Docker socket to run docker-compose on the host machine,
 # specifying the project directory for context.
-docker compose -p "${PROJECT_NAME}" -f "${PROJECT_PATH}/compose.yaml" up --wait
+docker run --rm -it -v "${PROJECT_NAME}:/app" ghcr.io/phpquant/stochastix:latest php --version
+docker compose -p "${PROJECT_NAME}" -f "${PROJECT_PATH}/compose.yaml" up -d
 
 echo
 echo "✅ Stochastix is running!"
-echo "You can now access the UI at https://localhost (or the host you configured)."
+echo "You can now access the UI at https://localhost."
 echo

templates/compose.yaml

@@ -21,6 +21,10 @@ services:
   messenger-worker:
     image: ghcr.io/phpquant/stochastix:latest
     restart: unless-stopped
+    environment:
+      MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
+      MERCURE_PUBLIC_URL: ${CADDY_MERCURE_PUBLIC_URL:-https://${SERVER_NAME:-localhost}:${HTTPS_PORT:-443}/.well-known/mercure}
+      MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
     volumes:
       - ./:/app
     command: php bin/console messenger:consume stochastix --limit=10 -vv

templates/frankenphp/docker-entrypoint.sh

@@ -6,27 +6,34 @@ if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 	# After the installation, the following block can be deleted
 	if [ ! -f composer.json ]; then
 		rm -Rf tmp/
-		composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability="$STABILITY" --prefer-dist --no-progress --no-interaction --no-install
+		composer create-project symfony/skeleton tmp --prefer-dist --no-progress --no-interaction --no-install
 
 		cd tmp
 		cp -Rp . ..
 		cd -
 		rm -Rf tmp/
 
-    	composer config --no-plugins allow-plugins.williarin/cook true
 		composer require "php:>=$PHP_VERSION" runtime/frankenphp-symfony
 		composer config --json extra.symfony.docker 'true'
+    	composer config --no-plugins allow-plugins.williarin/cook true
+		composer config minimum-stability dev
+		composer require stochastix/core
+		composer require --dev symfony/maker-bundle
+
+		sed -i '/###> doctrine\/doctrine-bundle ###/,/###< doctrine\/doctrine-bundle ###/d' compose.yaml
+		sed -i '/###> symfony\/mercure-bundle ###/,/###< symfony\/mercure-bundle ###/d' compose.yaml
+		sed -i '/###> doctrine\/doctrine-bundle ###/,/###< doctrine\/doctrine-bundle ###/d' compose.override.yaml
+		sed -i '/###> symfony\/mercure-bundle ###/,/###< symfony\/mercure-bundle ###/d' compose.override.yaml
+		sed -i '/###> doctrine\/doctrine-bundle ###/,/###< doctrine\/doctrine-bundle ###/d' .env
+		sed -i '/###> symfony\/mercure-bundle ###/,/###< symfony\/mercure-bundle ###/d' .env
 
 		if grep -q ^DATABASE_URL= .env; then
-			echo 'To finish the installation please press Ctrl+C to stop Docker Compose and run: docker compose up --build --wait'
-			sleep infinity
+			exit 0
 		fi
 	fi
 
 	if [ -z "$(ls -A 'vendor/' 2>/dev/null)" ]; then
 		composer install --prefer-dist --no-progress --no-interaction
-		composer require stochastix/core
-		composer require --dev symfony/maker-bundle
 	fi
 
 	# Display information about the current project
@@ -68,6 +75,7 @@ if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 		fi
 	fi
 
+	chown -R 1000:1000 .
 	setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var
 	setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var