Merge pull request #8672 from ProcessMaker/feature/FOUR-27925

FOUR-28753: [TCE] Military V1 - Phase 1: Update Script Executor for Intake

Author: nolanpro

ProcessMaker/Console/Commands/BuildScriptExecutors.php

@@ -18,7 +18,11 @@ class BuildScriptExecutors extends Command
      *
      * @var string
      */
-    protected $signature = 'processmaker:build-script-executor {lang} {user?} {--rebuild}';
+    protected $signature = 'processmaker:build-script-executor
+                            {lang : The ID or language of the script executor}
+                            {user? : The user ID to send the broadcast event to}
+                            {--rebuild : Rebuild the docker image}
+                            {--build-args= : The build arguments for the docker build command}';
 
     /**
      * The console command description.
@@ -159,6 +163,12 @@ public function buildExecutor()
         $command = Docker::command() .
             " build --build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
 
+        $buildArgs = $this->getBuildArgs();
+
+        foreach ($buildArgs as $buildArg) {
+            $command .= ' ' . $buildArg;
+        }
+
         $this->execCommand($command);
 
         $isNayra = $scriptExecutor->language === Base::NAYRA_LANG;
@@ -167,6 +177,29 @@ public function buildExecutor()
         }
     }
 
+    /**
+     * Get the build arguments for the docker build command.
+     *
+     * @return array
+     *   - '--build-arg <key>=<value>'
+     */
+    public function getBuildArgs(): array
+    {
+        $args = $this->option('build-args');
+
+        if ($args) {
+            $buildArgs = [];
+
+            foreach (explode(',', $args) as $arg) {
+                $buildArgs[] = '--build-arg ' . $arg;
+            }
+
+            return $buildArgs;
+        }
+
+        return [];
+    }
+
     public function getDockerfileContent(ScriptExecutor $scriptExecutor): string
     {
         $lang = $scriptExecutor->language;

ProcessMaker/Models/ScriptDockerNayraTrait.php

@@ -23,7 +23,6 @@ trait ScriptDockerNayraTrait
 {
 
     private $schema = 'http';
-    public static $nayraPort = 8080;
 
     /**
      * Execute the script task using Nayra Docker.
@@ -82,7 +81,7 @@ public function handleNayraDocker(string $code, array $data, array $config, $tim
     private function getNayraInstanceUrl()
     {
         $servers = self::getNayraAddresses();
-        return $this->schema . '://' . $servers[0] . ':' . static::$nayraPort;
+        return $this->schema . '://' . $servers[0] . ':' . $this->getNayraPort();
     }
 
     private function getDockerLogs($instanceName)
@@ -131,11 +130,14 @@ private function bringUpNayra($restart = false)
         if ($status) {
             $this->bringUpNayraContainer();
         } else {
-
+            $isHost = config('app.nayra_docker_network') === 'host';
+            $portMapping = $isHost ? '-e PORT=' . $this->getNayraPort() . ' ' : '-p ' . $this->getNayraPort() . ':8080 ';
             exec($docker . " stop {$instanceName}_nayra 2>&1 || true");
             exec($docker . " rm {$instanceName}_nayra 2>&1 || true");
             exec(
-                $docker . ' run -d --name ' . $instanceName . '_nayra '
+                $docker . ' run -d '
+                . ($this->getNayraPort() !== 8080 ? $portMapping : '')
+                . '--name ' . $instanceName . '_nayra '
                 . (config('app.nayra_docker_network')
                     ? '--network=' . config('app.nayra_docker_network') . ' '
                     : '')
@@ -322,4 +324,9 @@ public static function initNayraPhpUnitTest()
             }
         }
     }
+
+    private function getNayraPort()
+    {
+        return config('app.nayra_port', 8080);
+    }
 }

config/app.php

@@ -257,6 +257,7 @@
     'force_https' => env('FORCE_HTTPS', true),
 
     'nayra_docker_network' => env('NAYRA_DOCKER_NETWORK', 'host'),
+    'nayra_port' => env('NAYRA_PORT', 8080),
 
     // Process Request security log rate limit: 1 per day (86400 seconds)
     'process_request_errors_rate_limit' => env('PROCESS_REQUEST_ERRORS_RATE_LIMIT', 1),