Update Docker executor to build entrypoint command manually and avoid recursion

Vítězslav Dvořák · Vítězslav Dvořák · commit 6e178c319ff8 · 2025-09-11T13:35:59.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/MultiFlexi/CommonExecutor.php b/src/MultiFlexi/CommonExecutor.php
@@ -47,6 +47,7 @@ public function setJob(Job &$job): void
         if (!isset($this->environment)) {
             $this->environment = new ConfigFields('Executor'.\Ease\Functions::baseClassName($this));
         }
+
         $this->job = &$job;
         $this->setObjectName($job->getMyKey().'@'.\Ease\Logger\Message::getCallerName($this));
         $this->environment->addFields($job->getEnvironment());
diff --git a/src/MultiFlexi/Executor/Docker.php b/src/MultiFlexi/Executor/Docker.php
@@ -52,7 +52,12 @@ public function cmdparams()
     {
         file_put_contents($this->envFile(), $this->job->envFile());
 
-        return 'run --env-file '.$this->envFile().' --entrypoint '.$this->commandline().' '.$this->job->application->getDataValue('ociimage');
+        // Build the entrypoint command manually to avoid recursion
+        $entrypoint = $this->job->application->getDataValue('executable');
+        $params = $this->job->getCmdParams();
+        $ociimage = $this->job->application->getDataValue('ociimage');
+
+        return 'run --env-file '.$this->envFile().' --entrypoint "'.$entrypoint.'" '.$ociimage.' '.$params;
     }
 
     public function envFile()

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public function setJob(Job &$job): void`
`47`	`47`	`if (!isset($this->environment)) {`
`48`	`48`	`$this->environment = new ConfigFields('Executor'.\Ease\Functions::baseClassName($this));`
`49`	`49`	`}`
	`50`	`+`
`50`	`51`	`$this->job = &$job;`
`51`	`52`	`$this->setObjectName($job->getMyKey().'@'.\Ease\Logger\Message::getCallerName($this));`
`52`	`53`	`$this->environment->addFields($job->getEnvironment());`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,12 @@ public function cmdparams()`
`52`	`52`	`{`
`53`	`53`	`file_put_contents($this->envFile(), $this->job->envFile());`
`54`	`54`
`55`		`- return 'run --env-file '.$this->envFile().' --entrypoint '.$this->commandline().' '.$this->job->application->getDataValue('ociimage');`
	`55`	`+ // Build the entrypoint command manually to avoid recursion`
	`56`	`+ $entrypoint = $this->job->application->getDataValue('executable');`
	`57`	`+ $params = $this->job->getCmdParams();`
	`58`	`+ $ociimage = $this->job->application->getDataValue('ociimage');`
	`59`	`+`
	`60`	`+ return 'run --env-file '.$this->envFile().' --entrypoint "'.$entrypoint.'" '.$ociimage.' '.$params;`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`public function envFile()`