Skip to content

Commit 35db6bf

Browse files
committed
Merge branch 'develop' into task/FOUR-28803
2 parents aaf0a1b + 4bd98ec commit 35db6bf

5 files changed

Lines changed: 18 additions & 16 deletions

File tree

ProcessMaker/Console/Commands/BuildScriptExecutors.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,17 @@ public function buildExecutor()
160160
$this->info('Building the docker executor');
161161

162162
$image = $scriptExecutor->dockerImageName();
163+
$cacheArg = $this->option('rebuild') ? '--no-cache ' : '';
163164
$command = Docker::command() .
164-
" build --build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
165+
" build {$cacheArg}--build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
165166

166167
$buildArgs = $this->getBuildArgs();
167168

168169
foreach ($buildArgs as $buildArg) {
169170
$command .= ' ' . $buildArg;
170171
}
171172

173+
$this->info("Running command: $command");
172174
$this->execCommand($command);
173175

174176
$isNayra = $scriptExecutor->language === Base::NAYRA_LANG;

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "processmaker/processmaker",
3-
"version": "2026.6.2",
3+
"version": "2026.6.3",
44
"description": "BPM PHP Software",
55
"keywords": [
66
"php bpm processmaker"
@@ -51,7 +51,7 @@
5151
"predis/predis": "^2.3",
5252
"processmaker/docker-executor-lua": "^1.0",
5353
"processmaker/docker-executor-node": "1.1.0",
54-
"processmaker/docker-executor-php": "1.4.1",
54+
"processmaker/docker-executor-php": "1.4.2",
5555
"processmaker/laravel-i18next": "dev-master",
5656
"processmaker/nayra": "1.12.4",
5757
"processmaker/pmql": "1.13.3",
@@ -112,7 +112,7 @@
112112
"Gmail"
113113
],
114114
"processmaker": {
115-
"build": "90f2c5a3",
115+
"build": "4af44984",
116116
"cicd-enabled": true,
117117
"custom": {
118118
"package-ellucian-ethos": "1.19.10",

composer.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@processmaker/processmaker",
3-
"version": "2026.6.2",
3+
"version": "2026.6.3",
44
"description": "ProcessMaker 4",
55
"author": "DevOps <devops@processmaker.com>",
66
"license": "ISC",

0 commit comments

Comments
 (0)