Skip to content

Commit cdd76fc

Browse files
committed
refactor: Made nayra port configurable
1 parent 097ad4c commit cdd76fc

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

ProcessMaker/Models/ScriptDockerNayraTrait.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ trait ScriptDockerNayraTrait
2323
{
2424

2525
private $schema = 'http';
26-
public static $nayraPort = 8080;
2726

2827
/**
2928
* Execute the script task using Nayra Docker.
@@ -82,7 +81,7 @@ public function handleNayraDocker(string $code, array $data, array $config, $tim
8281
private function getNayraInstanceUrl()
8382
{
8483
$servers = self::getNayraAddresses();
85-
return $this->schema . '://' . $servers[0] . ':' . static::$nayraPort;
84+
return $this->schema . '://' . $servers[0] . ':' . $this->getNayraPort();
8685
}
8786

8887
private function getDockerLogs($instanceName)
@@ -135,7 +134,9 @@ private function bringUpNayra($restart = false)
135134
exec($docker . " stop {$instanceName}_nayra 2>&1 || true");
136135
exec($docker . " rm {$instanceName}_nayra 2>&1 || true");
137136
exec(
138-
$docker . ' run -d --name ' . $instanceName . '_nayra '
137+
$docker . ' run -d --name '
138+
. '-p ' . $this->getNayraPort() . ':8080 '
139+
. $instanceName . '_nayra '
139140
. (config('app.nayra_docker_network')
140141
? '--network=' . config('app.nayra_docker_network') . ' '
141142
: '')
@@ -322,4 +323,9 @@ public static function initNayraPhpUnitTest()
322323
}
323324
}
324325
}
326+
327+
private function getNayraPort()
328+
{
329+
return config('app.nayra_port', 8080);
330+
}
325331
}

config/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@
257257
'force_https' => env('FORCE_HTTPS', true),
258258

259259
'nayra_docker_network' => env('NAYRA_DOCKER_NETWORK', 'host'),
260+
'nayra_port' => env('NAYRA_PORT', 8080),
260261

261262
// Process Request security log rate limit: 1 per day (86400 seconds)
262263
'process_request_errors_rate_limit' => env('PROCESS_REQUEST_ERRORS_RATE_LIMIT', 1),

0 commit comments

Comments
 (0)