This is an automated email from the ASF dual-hosted git repository.
dhanak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 856db5c901a kie-tools#3466: [serverless-logic-web-tools] normal
deployment Data Index not available (#3467)
856db5c901a is described below
commit 856db5c901ae15aa029dfc713104d9fcae8674a8
Author: Fabrizio Antonangeli <[email protected]>
AuthorDate: Tue Mar 24 15:11:16 2026 +0100
kie-tools#3466: [serverless-logic-web-tools] normal deployment Data Index
not available (#3467)
---
.../Containerfile | 9 ++++++---
.../env/index.js | 7 +++++++
.../package.json | 20 +++++++++++++++-----
pnpm-lock.yaml | 12 ++++++++++++
repo/graph.dot | 3 ++-
repo/graph.json | 17 +++++++++++------
6 files changed, 53 insertions(+), 15 deletions(-)
diff --git
a/packages/serverless-logic-web-tools-swf-builder-image/Containerfile
b/packages/serverless-logic-web-tools-swf-builder-image/Containerfile
index f28831399d3..8e4434d9fb0 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/Containerfile
+++ b/packages/serverless-logic-web-tools-swf-builder-image/Containerfile
@@ -16,16 +16,19 @@
# under the License.
ARG BASE_IMAGE_URL
+ARG KOGITO_VERSION
FROM --platform=linux/amd64 $BASE_IMAGE_URL
ENV PATH="${PATH}:/usr/share/maven/bin"
COPY dist-dev/webapp/ src/main/resources/META-INF/resources/
+COPY dist-dev/settings.xml /home/kogito/.m2/settings.xml
RUN rm .dockerignore .gitignore README.md \
&& rm -rf .mvn/ src/main/java/ \
- && mvn quarkus:add-extension
-Dextensions="quarkus-jsonp,quarkus-smallrye-openapi,quarkus-resteasy,smallrye-health"
\
- && echo -e
'\nquarkus.http.enable-compression=true\nquarkus.swagger-ui.always-include=true\nquarkus.http.host=0.0.0.0\nquarkus.http.cors=true\nquarkus.http.cors.origins=*\nkogito.service.url=http://localhost:8080'
>> src/main/resources/application.properties \
- && mvn clean package -B \
+ && mvn quarkus:add-extension
-Dextensions="quarkus-jsonp,quarkus-smallrye-openapi,quarkus-resteasy,smallrye-health"
-s /home/kogito/.m2/settings.xml \
+ && sed -i "/<\/dependencies>/s/<\/dependencies>/ <dependency>\n
<groupId>org.kie<\/groupId>\n
<artifactId>kogito-addons-quarkus-data-index-inmemory<\/artifactId>\n
<version>${KOGITO_VERSION}<\/version>\n <\/dependency>\n <\/dependencies>/"
pom.xml \
+ && echo -e
'\nquarkus.http.enable-compression=true\nquarkus.swagger-ui.always-include=true\nquarkus.http.host=0.0.0.0\nquarkus.http.cors=true\nquarkus.http.cors.origins=*\nkogito.service.url=http://localhost:8080\nquarkus.kogito.data-index.graphql.ui.always-include=true\nquarkus.devservices.enabled=false\nquarkus.dev-ui.cors.enabled=false\nquarkus.oidc.enabled=false\nquarkus.log.category."org.kie.kogito.jobs".level=ERROR\nquarkus.log.category."io.zonky".level=ERROR\nquarkus.log.categor
[...]
+ && mvn clean package -B -s /home/kogito/.m2/settings.xml \
&& rm -rf target/
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
index 0efda095d0b..0aadd5c42ab 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
@@ -23,6 +23,10 @@ const rootEnv = require("@kie-tools/root-env/env");
const serverlessLogicWebToolsSwfBuilderImageEnv =
require("@kie-tools/serverless-logic-web-tools-swf-builder-image-env/env");
const sonataflowBuilderImageEnv =
require("@kie-tools/sonataflow-builder-image/env");
+const {
+ env: { mavenM2RepoViaHttpImage: mavenM2RepoViaHttpImageEnv },
+} = require("@kie-tools/maven-m2-repo-via-http-image/env");
+
module.exports = composeEnv([rootEnv,
serverlessLogicWebToolsSwfBuilderImageEnv, sonataflowBuilderImageEnv], {
vars: varsWithName({
SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl: {
@@ -34,6 +38,9 @@ module.exports = composeEnv([rootEnv,
serverlessLogicWebToolsSwfBuilderImageEnv,
return {
slwtBuilderImage: {
baseImageUrl:
getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl),
+ dev: {
+ mavenM2RepoViaHttpImage:
`${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
+ },
},
};
},
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/package.json
b/packages/serverless-logic-web-tools-swf-builder-image/package.json
index d86f263f4cd..47b1f5d290c 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-builder-image/package.json
@@ -14,19 +14,29 @@
},
"scripts": {
"build:dev": "echo Nothing to do",
- "build:prod": "pnpm cleanup && pnpm copy:assets && run-script-os",
+ "build:prod": "pnpm cleanup && pnpm copy:webapp && run-script-os",
"build:prod:darwin:win32": "echo \"Build not supported on Windows and
macOS\"",
- "build:prod:linux": "run-script-if --bool \"$(build-env
containerImages.build)\" --then \"pnpm image:docker:build\"",
- "build:prod:skipped": "pnpm cleanup && pnpm copy:assets && run-script-os",
+ "build:prod:linux": "run-script-if --bool \"$(build-env
containerImages.build)\" --then \"pnpm m2-repo-via-http:container:run\" \"pnpm
copy:maven-m2-repo-via-http-image--settings-xml\" \"pnpm image:docker:build\"
--finally \"pnpm m2-repo-via-http:container:kill\" \"rimraf
./dist-dev/tmp-m2\"",
+ "build:prod:skipped": "pnpm cleanup && pnpm copy:webapp && run-script-os",
"cleanup": "rimraf dist-dev && mkdir dist-dev",
- "copy:assets": "pnpm copy:webapp",
+ "copy:maven-m2-repo-via-http-image--settings-xml": "run-script-os",
+ "copy:maven-m2-repo-via-http-image--settings-xml:linux:darwin":
"M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL=$(docker inspect -f
'{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' m2-repo-via-http)
envsubst <
./node_modules/@kie-tools/maven-m2-repo-via-http-image/settings.xml.envsubst >
dist-dev/settings.xml",
+ "copy:maven-m2-repo-via-http-image--settings-xml:win32": "pnpm powershell
\"(Get-Content
./node_modules/@kie-tools/maven-m2-repo-via-http-image/settings.xml.envsubst)
-replace '$M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL', $(docker inspect -f
'{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' m2-repo-via-http) |
Set-Content ./dist-dev/settings.xml\"",
"copy:webapp": "cp -r ./node_modules/sonataflow-deployment-webapp/dist
dist-dev/webapp",
- "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] &&
echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo
$(build-env slwtBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env
slwtBuilderImageEnv.registry)/$(build-env
slwtBuilderImageEnv.account)/$(build-env slwtBuilderImageEnv.name):%s\n\" |
xargs echo) --build-arg BASE_IMAGE_URL=$(build-env
slwtBuilderImage.baseImageUrl) .\" --else \"echo Docker not found, skipping
image build.\""
+ "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] &&
echo true || echo false) --then \"docker build --network=host --ulimit
nofile=5000:5000 $(echo $(build-env slwtBuilderImageEnv.buildTag) | xargs
printf -- \"-t $(build-env slwtBuilderImageEnv.registry)/$(build-env
slwtBuilderImageEnv.account)/$(build-env slwtBuilderImageEnv.name):%s\n\" |
xargs echo) --build-arg BASE_IMAGE_URL=$(build-env
slwtBuilderImage.baseImageUrl) --build-arg KOGITO_VERSION=$(build-env ver [...]
+ "m2-repo-via-http:container:kill": "(docker container kill
m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)",
+ "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e
'require(`@kie-tools/maven-base`).prepareHardLinkedM2ForPackage(`./dist-dev/tmp-m2/repository`,
`./node_modules/@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app`)'",
+ "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill
|| true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker
run --name m2-repo-via-http -v \"./dist-dev/tmp-m2/repository:/var/www/html:z\"
-dit $(build-env slwtBuilderImage.dev.mavenM2RepoViaHttpImage)",
+ "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
+ "@kie-tools/maven-m2-repo-via-http-image": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/serverless-logic-web-tools-swf-builder-image-env":
"workspace:*",
+ "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app":
"workspace:*",
"@kie-tools/sonataflow-builder-image": "workspace:*",
+ "cross-env": "^7.0.3",
"rimraf": "^3.0.2",
"run-script-os": "^1.1.6",
"sonataflow-deployment-webapp": "workspace:*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2a16022a199..047101a6187 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10374,15 +10374,27 @@ importers:
packages/serverless-logic-web-tools-swf-builder-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
+ '@kie-tools/maven-m2-repo-via-http-image':
+ specifier: workspace:*
+ version: link:../maven-m2-repo-via-http-image
'@kie-tools/root-env':
specifier: workspace:*
version: link:../root-env
'@kie-tools/serverless-logic-web-tools-swf-builder-image-env':
specifier: workspace:*
version: link:../serverless-logic-web-tools-swf-builder-image-env
+ '@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app':
+ specifier: workspace:*
+ version: link:../serverless-logic-web-tools-swf-deployment-quarkus-app
'@kie-tools/sonataflow-builder-image':
specifier: workspace:*
version: link:../sonataflow-builder-image
+ cross-env:
+ specifier: ^7.0.3
+ version: 7.0.3
rimraf:
specifier: ^3.0.2
version: 3.0.2
diff --git a/repo/graph.dot b/repo/graph.dot
index 001618432bb..be3d199cd56 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -194,9 +194,9 @@ digraph G {
"@kie-tools/sonataflow-dev-app" [ color = "black", fontcolor = "black",
style = "dashed, rounded" ];
"@kie-tools/serverless-logic-web-tools-base-builder-image" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/serverless-logic-web-tools-swf-builder-image" [ color = "black",
fontcolor = "black", style = "dashed, rounded" ];
+ "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/sonataflow-builder-image" [ color = "black", fontcolor =
"black", style = "dashed, rounded" ];
"sonataflow-deployment-webapp" [ color = "blue", fontcolor = "blue", style =
"rounded" ];
- "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/serverless-workflow-diagram-editor-assets" [ color = "blue",
fontcolor = "blue", style = "rounded" ];
"@kie-tools/serverless-workflow-text-editor" [ color = "blue", fontcolor =
"blue", style = "rounded" ];
@@ -590,6 +590,7 @@ digraph G {
"@kie-tools/serverless-logic-web-tools-base-builder-image" ->
"@kie/kogito-base-builder-image" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-base-builder-image-env" ->
"@kie-tools/root-env" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-builder-image" ->
"@kie-tools/serverless-logic-web-tools-swf-builder-image-env" [ style =
"dashed", color = "black" ];
+ "@kie-tools/serverless-logic-web-tools-swf-builder-image" ->
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ style =
"dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-builder-image" ->
"@kie-tools/sonataflow-builder-image" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-builder-image" ->
"sonataflow-deployment-webapp" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-builder-image-env" ->
"@kie-tools/root-env" [ style = "dashed", color = "black" ];
diff --git a/repo/graph.json b/repo/graph.json
index 2f7f0e3748b..b63582b4127 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -202,8 +202,8 @@
{ "id": "@kie-tools/yard-validator" },
{ "id": "@kie-tools/serverless-logic-web-tools-base-builder-image" },
{ "id": "@kie-tools/serverless-logic-web-tools-swf-builder-image" },
- { "id": "sonataflow-deployment-webapp" },
{ "id":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" },
+ { "id": "sonataflow-deployment-webapp" },
{ "id": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" },
{ "id": "@kie-tools/serverless-workflow-diagram-editor" },
{ "id": "@kie-tools/serverless-workflow-diagram-editor-envelope" },
@@ -1426,6 +1426,11 @@
"target":
"@kie-tools/serverless-logic-web-tools-swf-builder-image-env",
"weight": 1
},
+ {
+ "source": "@kie-tools/serverless-logic-web-tools-swf-builder-image",
+ "target":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
+ "weight": 1
+ },
{
"source": "@kie-tools/serverless-logic-web-tools-swf-builder-image",
"target": "@kie-tools/sonataflow-builder-image",
@@ -1436,6 +1441,11 @@
"target": "sonataflow-deployment-webapp",
"weight": 1
},
+ {
+ "source":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
+ "target": "@kie-tools/sonataflow-quarkus-devui",
+ "weight": 1
+ },
{ "source": "sonataflow-deployment-webapp", "target":
"@kie-tools-core/react-hooks", "weight": 1 },
{
"source": "sonataflow-deployment-webapp",
@@ -1448,11 +1458,6 @@
"weight": 1
},
{ "source": "sonataflow-deployment-webapp", "target":
"@kie-tools/sonataflow-dev-app", "weight": 1 },
- {
- "source":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
- "target": "@kie-tools/sonataflow-quarkus-devui",
- "weight": 1
- },
{
"source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
"target": "@kie-tools/maven-m2-repo-via-http-image",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
