From e12bf570f98fc7215c948d774bee2fc824cd4d8c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 7 Dec 2025 14:39:43 +0000
Subject: [PATCH] Use --no-install with require and run separate install
 command

Co-authored-by: jbtronics <5410681+jbtronics@users.noreply.github.com>
---
 .docker/frankenphp/docker-entrypoint.sh | 13 ++++++++++---
 .docker/partdb-entrypoint.sh            | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.docker/frankenphp/docker-entrypoint.sh b/.docker/frankenphp/docker-entrypoint.sh
index 582793ae..56b3bc31 100644
--- a/.docker/frankenphp/docker-entrypoint.sh
+++ b/.docker/frankenphp/docker-entrypoint.sh
@@ -32,11 +32,18 @@ if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 		# Note: COMPOSER_EXTRA_PACKAGES is intentionally not quoted to allow word splitting
 		# This enables passing multiple package names separated by spaces
 		# shellcheck disable=SC2086
-		composer require $COMPOSER_EXTRA_PACKAGES --no-dev --no-interaction --no-progress --optimize-autoloader
+		composer require $COMPOSER_EXTRA_PACKAGES --no-install --no-interaction --no-progress
 		if [ $? -eq 0 ]; then
-			echo "Successfully installed additional composer packages"
+			echo "Running composer install to install packages without dev dependencies..."
+			composer install --no-dev --no-interaction --no-progress --optimize-autoloader
+			if [ $? -eq 0 ]; then
+				echo "Successfully installed additional composer packages"
+			else
+				echo "Failed to install composer dependencies"
+				exit 1
+			fi
 		else
-			echo "Failed to install additional composer packages"
+			echo "Failed to add additional composer packages to composer.json"
 			exit 1
 		fi
 	fi
diff --git a/.docker/partdb-entrypoint.sh b/.docker/partdb-entrypoint.sh
index 7f49b505..61e8d1e6 100644
--- a/.docker/partdb-entrypoint.sh
+++ b/.docker/partdb-entrypoint.sh
@@ -45,11 +45,18 @@ if [ -n "$COMPOSER_EXTRA_PACKAGES" ]; then
     # Note: COMPOSER_EXTRA_PACKAGES is intentionally not quoted to allow word splitting
     # This enables passing multiple package names separated by spaces
     # shellcheck disable=SC2086
-    sudo -E -u www-data composer require $COMPOSER_EXTRA_PACKAGES --no-dev --no-interaction --no-progress --optimize-autoloader
+    sudo -E -u www-data composer require $COMPOSER_EXTRA_PACKAGES --no-install --no-interaction --no-progress
     if [ $? -eq 0 ]; then
-        echo "Successfully installed additional composer packages"
+        echo "Running composer install to install packages without dev dependencies..."
+        sudo -E -u www-data composer install --no-dev --no-interaction --no-progress --optimize-autoloader
+        if [ $? -eq 0 ]; then
+            echo "Successfully installed additional composer packages"
+        else
+            echo "Failed to install composer dependencies"
+            exit 1
+        fi
     else
-        echo "Failed to install additional composer packages"
+        echo "Failed to add additional composer packages to composer.json"
         exit 1
     fi
 fi