You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ti...@apache.org on 2024/06/05 03:08:25 UTC
(incubator-kie-tools) branch main updated: NO-ISSUE: Use container IP directly of `maven-m2-repo-via-http` (#2400)
This is an automated email from the ASF dual-hosted git repository.
tiagobento 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 03d51132e43 NO-ISSUE: Use container IP directly of `maven-m2-repo-via-http` (#2400)
03d51132e43 is described below
commit 03d51132e43249a626cd9093069db330d6e19e63
Author: Tiago Bento <15...@users.noreply.github.com>
AuthorDate: Tue Jun 4 23:08:21 2024 -0400
NO-ISSUE: Use container IP directly of `maven-m2-repo-via-http` (#2400)
---
.../dev-deployment-kogito-quarkus-blank-app-image/env/index.js | 1 -
.../dev-deployment-kogito-quarkus-blank-app-image/package.json | 8 ++++----
packages/maven-m2-repo-via-http-image/README.md | 4 ++--
packages/maven-m2-repo-via-http-image/settings.xml.envsubst | 6 +++---
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
index cd452584f9b..5e3b3853f15 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
+++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
@@ -69,7 +69,6 @@ module.exports = composeEnv([rootEnv], {
mavenM2RepoViaHttpImage: getOrDefault(
this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__mavenM2RepoViaHttpImage
),
- mavenM2RepoViaHttpImagePort: 8008,
},
},
};
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
index cd74bc44c5d..e86e04ea3e1 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
+++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
@@ -13,13 +13,13 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm copy:assets\" \"pnpm m2-repo-via-http:container:run\" \"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\" --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:maven-m2-repo-via-http-image--settings-xml",
"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_PORT=$(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImagePort) 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_PORT', $(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImagePort) | Set-Content ./dist-dev/settings.xml\"",
+ "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:quarkus-app": "run-script-os",
"copy:quarkus-app:linux:darwin": " cp -R ./node_modules/@kie-tools/dev-deployment-kogito-quarkus-blank-app/ ./dist-dev/quarkus-app && rm -rf ./dist-dev/quarkus-app/node_modules ./dist-dev/quarkus-app/install.js ./dist-dev/quarkus-app/env ./dist-dev/quarkus-app/package.json",
"copy:quarkus-app:win32": "pnpm powershell \"New-Item -ItemType Directory -Force -Path ./dist-dev/quarkus-app; Copy-Item -R ./node_modules/@kie-tools/dev-deployment-kogito-quarkus-blank-app/* ./dist-dev/quarkus-app -Exclude @('node_modules')\"",
@@ -31,7 +31,7 @@
"image:podman:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ -e podman",
"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 ~/.m2/repository:/var/www/html -dit -p \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImagePort):80\" $(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)",
+ "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 devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
},
"dependencies": {
diff --git a/packages/maven-m2-repo-via-http-image/README.md b/packages/maven-m2-repo-via-http-image/README.md
index 1146e369e98..3f4b01b27a7 100644
--- a/packages/maven-m2-repo-via-http-image/README.md
+++ b/packages/maven-m2-repo-via-http-image/README.md
@@ -19,8 +19,8 @@ Interpolating settings.xml
- Linux and macOS:
- `M2_REPO_VIA_HTTP_PORT=8008 envsubst < settings.xml.envsubst > /tmp/settings.xml`
+ `M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL=localhost:8008 envsubst < settings.xml.envsubst > /tmp/settings.xml`
- Windows (PowerShell):
- `(Get-Content settings.xml.envsubst) -replace '$M2_REPO_VIA_HTTP_PORT', 8008 | Set-Content /tmp/settings.xml`
+ `(Get-Content settings.xml.envsubst) -replace '$M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL', localhost:8008 | Set-Content /tmp/settings.xml`
diff --git a/packages/maven-m2-repo-via-http-image/settings.xml.envsubst b/packages/maven-m2-repo-via-http-image/settings.xml.envsubst
index e81922637e4..8cc22d223db 100644
--- a/packages/maven-m2-repo-via-http-image/settings.xml.envsubst
+++ b/packages/maven-m2-repo-via-http-image/settings.xml.envsubst
@@ -6,7 +6,7 @@
<id>kie-tools--maven-m2-repo-via-http-allowed</id>
<mirrorOf>kie-tools--maven-m2-repo-via-http</mirrorOf>
<name>Mirror to override default blocking mirror that blocks http.</name>
- <url>http://localhost:$M2_REPO_VIA_HTTP_PORT</url>
+ <url>http://$M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL</url>
</mirror>
</mirrors>
@@ -20,7 +20,7 @@
<repository>
<id>kie-tools--maven-m2-repo-via-http</id>
<name>KIE Tools :: Maven M2 Repo via HTTP</name>
- <url>http://localhost:$M2_REPO_VIA_HTTP_PORT/</url>
+ <url>http://$M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -37,7 +37,7 @@
<pluginRepository>
<id>kie-tools--maven-m2-repo-via-http</id>
<name>KIE Tools :: Maven M2 Repo via HTTP</name>
- <url>http://localhost:$M2_REPO_VIA_HTTP_PORT/</url>
+ <url>http://$M2_REPO_VIA_HTTP_URL_WITHOUT_PROTOCOL/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org