This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new e73e33a7520 [10.0.x]
NO-ISSUE:`serverless-logic-web-tools-swf-dev-mode-image` optimizations for
filesize (#2591)
e73e33a7520 is described below
commit e73e33a7520db2855f4b26f705c5449e6f0cfa63
Author: Thiago Lugli <[email protected]>
AuthorDate: Fri Sep 13 23:58:07 2024 -0300
[10.0.x] NO-ISSUE:`serverless-logic-web-tools-swf-dev-mode-image`
optimizations for filesize (#2591)
---
packages/python-venv/requirements.txt | 4 ++--
.../Containerfile | 11 +++++------
.../package.json | 4 +++-
pnpm-lock.yaml | 3 +++
repo/graph.dot | 1 +
repo/graph.json | 5 +++++
6 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/packages/python-venv/requirements.txt
b/packages/python-venv/requirements.txt
index d0ae8d7b5c2..f52f31482e4 100644
--- a/packages/python-venv/requirements.txt
+++ b/packages/python-venv/requirements.txt
@@ -3,7 +3,7 @@ cekit==4.11.0
behave==1.2.6
lxml==5.2.1
docker==7.0.0
-docker-squash==1.2.0
+docker-squash==1.2.1
elementpath==4.4.0
pyyaml==6.0.1
ruamel.yaml==0.18.6
@@ -11,4 +11,4 @@ python-dateutil==2.9.0.post0
Jinja2==3.1.4
pykwalify==1.8.0
colorlog==6.8.2
-click==8.1.7
\ No newline at end of file
+click==8.1.7
diff --git
a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
index 4d801e06da2..48395f4882c 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
@@ -22,8 +22,6 @@ FROM --platform=linux/amd64
docker.io/apache/incubator-kie-kogito-base-builder:$
ENV PATH="${PATH}:/usr/share/maven/bin"
USER root
-RUN chown kogito /home/kogito/.m2
-USER kogito
COPY --chown=kogito:root dist-dev/quarkus-app/
/home/kogito/serverless-logic-web-tools-swf-deployment-quarkus-app/
COPY --chown=kogito:root dist-dev/settings.xml /home/kogito/.m2/settings.xml
@@ -31,7 +29,8 @@ COPY --chown=kogito:root entrypoint.sh
/home/kogito/entrypoint.sh
WORKDIR /home/kogito/serverless-logic-web-tools-swf-deployment-quarkus-app/
-RUN rm -rf src/test/ && \
+RUN chown kogito /home/kogito/.m2 && \
+ rm -rf src/test/ && \
mvn clean package \
quarkus:go-offline \
-B \
@@ -39,10 +38,10 @@ RUN rm -rf src/test/ && \
-s /home/kogito/.m2/settings.xml \
-Dmaven.test.skip \
-Dmaven.repo.local=/home/kogito/.m2/repository \
- -Dquarkus-profiles=build,dev
+ -Dquarkus-profiles=build,dev && \
+ chmod -R 775 /home/kogito && \
+ mkdir -p -m 777 /tmp/app
-USER root
-RUN chmod -R 775 /home/kogito && mkdir -p -m 777 /tmp/app
USER kogito
EXPOSE 8080
diff --git
a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
index c94a5c47300..0426df4a296 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues";
},
"scripts": {
- "build": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm
image:docker:build\" --finally \"pnpm m2-repo-via-http:container:kill\"",
+ "build": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm
image:docker:build\" \"pnpm image:docker:squash\" --finally \"pnpm
m2-repo-via-http:container:kill\"",
"build:dev": "pnpm build",
"build:prod": "pnpm build",
"copy:assets": "rimraf dist-dev && mkdir -p ./dist-dev && pnpm
copy:quarkus-app && pnpm copy:sonataflow-deployment-webapp && pnpm
copy:maven-m2-repo-via-http-image--settings-xml",
@@ -27,6 +27,7 @@
"copy:sonataflow-deployment-webapp:linux:darwin": "cp -R
./node_modules/sonataflow-deployment-webapp/dist/*
./dist-dev/quarkus-app/src/main/resources/META-INF/resources",
"copy:sonataflow-deployment-webapp:win32": "pnpm powershell \"Copy-Item -R
./node_modules/sonataflow-deployment-webapp/dist/*
./dist-dev/quarkus-app/src/main/resources/META-INF/resources\"",
"image:docker:build": "kie-tools--image-builder build
--allowHostNetworkAccess -r \"$(build-env swfDevModeImageEnv.registry)\" -a
\"$(build-env swfDevModeImageEnv.account)\" -n \"$(build-env
swfDevModeImageEnv.name)\" -t \"$(build-env swfDevModeImageEnv.buildTag)\"
--build-arg KOGITO_IMAGE_TAG=\"$(build-env swfDevModeImage.kogitoImageTag)\"",
+ "image:docker:squash": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker
context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t
$(build-env swfDevModeImageEnv.registry)/$(build-env
swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env
swfDevModeImageEnv.buildTag) $(build-env
swfDevModeImageEnv.registry)/$(build-env
swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env
swfDevModeIma [...]
"install": "node install.js",
"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:run": "(pnpm m2-repo-via-http:container:kill
|| true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate
-Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit
$(build-env swfDevModeImage.dev.mavenM2RepoViaHttpImage)",
@@ -36,6 +37,7 @@
"@kie-tools/image-builder": "workspace:*",
"@kie-tools/maven-config-setup-helper": "workspace:*",
"@kie-tools/maven-m2-repo-via-http-image": "workspace:*",
+ "@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app":
"workspace:*",
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env":
"workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 181c82bb719..fdb07546c0f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9096,6 +9096,9 @@ importers:
'@kie-tools/maven-m2-repo-via-http-image':
specifier: workspace:*
version: link:../maven-m2-repo-via-http-image
+ '@kie-tools/python-venv':
+ specifier: workspace:*
+ version: link:../python-venv
'@kie-tools/root-env':
specifier: workspace:*
version: link:../root-env
diff --git a/repo/graph.dot b/repo/graph.dot
index 0c5974a0bf3..738fe698794 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -512,6 +512,7 @@ digraph G {
"@kie-tools/serverless-logic-web-tools-swf-builder-image-env" ->
"@kie-tools/root-env" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" ->
"@kie-tools/sonataflow-quarkus-devui" [ style = "solid", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ];
+ "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"@kie-tools/python-venv" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ style =
"dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style =
"dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"sonataflow-deployment-webapp" [ style = "dashed", color = "black" ];
diff --git a/repo/graph.json b/repo/graph.json
index f706f858ade..16bb2c60b77 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -2184,6 +2184,11 @@
"target": "@kie-tools/maven-m2-repo-via-http-image",
"weight": 1
},
+ {
+ "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
+ "target": "@kie-tools/python-venv",
+ "weight": 1
+ },
{
"source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
"target":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
