Skip to content

Observation/FOUR-11513: Error integrating sdk-java #6175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 2 commits into from
Feb 7, 2024
Merged

Observation/FOUR-11513: Error integrating sdk-java #6175

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad949af
Fix SKD_DIR path
agustinbusso Feb 7, 2024
0f0c672
Fox sonarCube issues
agustinbusso Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix SKD_DIR path
  • Loading branch information
@agustinbusso
agustinbusso committed Feb 7, 2024
commit ad949af192561cd5cfb27de31835db3679719d11
6 changes: 3 additions & 3 deletions ProcessMaker/Console/Commands/BuildScriptExecutors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function handle()
$this->userId = $this->argument('user');
try {
$this->buildExecutor();
} catch (\Exception $e) {
} catch (Exception $e) {
if ($this->userId) {
event(new BuildScriptExecutor($e->getMessage(), $this->userId, 'error'));
}
Expand Down Expand Up @@ -153,7 +153,7 @@ public function buildExecutor()
$this->info('Building the docker executor');

$image = $scriptExecutor->dockerImageName();
$command = Docker::command() . " build --build-arg SDK_DIR=/sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
$command = Docker::command() . " build --build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";

if ($this->userId) {
$this->runProc(
Expand Down Expand Up @@ -229,7 +229,7 @@ private function associateWithExistingImage($executor)
$instance = config('app.instance');
foreach ($images as $image) {
if (!preg_match('/executor-' . $instance . '-.+-(\d+):/', $image, $match)) {
throw new \Exception('Not a valid image:' . (string) $image);
throw new Exception('Not a valid image:' . (string) $image);
}
$id = intval($match[1]);
$existingExecutor = ScriptExecutor::find($id);
Expand Down