This is an automated email from the ASF dual-hosted git repository. rantunes pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools-temporary-rnd-do-not-use.git
commit d34a205fff2965e078774801e34ba7e5dbf8816c Author: Wagner Scholl Lemos <[email protected]> AuthorDate: Wed Nov 8 11:59:04 2023 -0300 kie-issues#633: Change the Extended Services Go App for the new Extended Services Java in the Extended Services Image (#2031) --- packages/extended-services-java/README.md | 12 +--- packages/extended-services-java/env/index.js | 27 +++----- packages/extended-services-java/install.js | 7 +-- packages/extended-services-java/package.json | 9 ++- packages/extended-services-java/pom.xml | 13 +++- .../src/main/java/org/kie/tools/PingResponse.java | 24 +------ .../src/main/java/org/kie/tools/ProxyConfig.java | 55 ---------------- .../src/main/resources/application.properties | 5 +- ...{ProxyConfigTest.java => AbstractPingTest.java} | 29 ++------- .../test/java/org/kie/tools/PingResourceTest.java | 68 ++++++++------------ .../test/java/org/kie/tools/PingResponseTest.java | 73 +++++++--------------- packages/kie-sandbox-distribution/README.md | 2 +- .../kie-sandbox-distribution/docker-compose.yaml | 6 +- .../tests/integrationTest.test.js | 7 ++- .../Containerfile | 26 +++++--- .../kie-sandbox-extended-services-image/README.md | 17 +++++ .../env/index.js | 2 +- .../package.json | 14 ++--- pnpm-lock.yaml | 4 +- repo/graph.dot | 2 +- repo/graph.json | 2 +- 21 files changed, 148 insertions(+), 256 deletions(-) diff --git a/packages/extended-services-java/README.md b/packages/extended-services-java/README.md index 533111d227..f1a9629577 100644 --- a/packages/extended-services-java/README.md +++ b/packages/extended-services-java/README.md @@ -11,9 +11,8 @@ You can run it on developement mode: ## Parameters -- `-Dip=<PORT_NUMBER>`: Sets app port, the default value is `21345`. -- `-Dport=<HOST>`: Sets app host, the default value is `0.0.0.0`. -- `-DkieSandboxUrl=<URL>`: Sets kie.sandbox.url host, the default value is `https://localhost:9001`. +<!-- - `-Dquarkus.http.host=<HOST>`: Sets the Quarkus app host, the default value is `0.0.0.0`. +- `-Dquarkus.http.port=<PORT_NUMBER>`: Sets the Quarkus app port, the default value is `21345`. --> ### API @@ -23,16 +22,11 @@ The root route is a proxy and will forward your requests to the autogenerated po #### `/ping` -[GET] returns the API version, the proxy port and IP and the KIE Sandbox URL. +[GET] returns the API version, and service status. ```json { "version": "0.0.0", - "proxy": { - "ip": "0.0.0.0", - "port": "21345" - }, - "kieSandboxUrl": "https://localhost:9001";, "started": true } ``` diff --git a/packages/extended-services-java/env/index.js b/packages/extended-services-java/env/index.js index 7f20a17d63..9100cc450a 100644 --- a/packages/extended-services-java/env/index.js +++ b/packages/extended-services-java/env/index.js @@ -21,30 +21,23 @@ const { getOrDefault, varsWithName, composeEnv } = require("@kie-tools-scripts/b module.exports = composeEnv([require("@kie-tools/root-env/env")], { vars: varsWithName({ - EXTENDED_SERVICES__version: { - default: require("../package.json").version, - description: "Extended Services Version", - }, - EXTENDED_SERVICES__ip: { + EXTENDED_SERVICES_JAVA__host: { default: "0.0.0.0", - description: "Extended Services IP", + description: + "Quarkus HTTP Host. Configures the IP address or host to which a Quarkus application binds for incoming HTTP requests,", }, - EXTENDED_SERVICES__port: { + EXTENDED_SERVICES_JAVA__port: { default: "21345", - description: "Extended Services Port", - }, - EXTENDED_SERVICES__kieSandboxUrl: { - default: "https://localhost:9001";, - description: "KIE Sandbox URL", + description: + "Quarkus HTTP Port. Configures the network port on which a Quarkus application accepts incoming HTTP requests.", }, }), get env() { return { - extendedServices: { - version: getOrDefault(this.vars.EXTENDED_SERVICES__version), - ip: getOrDefault(this.vars.EXTENDED_SERVICES__ip), - port: getOrDefault(this.vars.EXTENDED_SERVICES__port), - kieSandboxUrl: getOrDefault(this.vars.EXTENDED_SERVICES__kieSandboxUrl), + extendedServicesJava: { + version: require("../package.json").version, + host: getOrDefault(this.vars.EXTENDED_SERVICES_JAVA__host), + port: getOrDefault(this.vars.EXTENDED_SERVICES_JAVA__port), }, }; }, diff --git a/packages/extended-services-java/install.js b/packages/extended-services-java/install.js index f70fd0c151..bd0aeed4d9 100644 --- a/packages/extended-services-java/install.js +++ b/packages/extended-services-java/install.js @@ -21,10 +21,9 @@ const buildEnv = require("./env"); const { setup } = require("@kie-tools/maven-config-setup-helper"); setup(` - -Drevision=${buildEnv.env.extendedServices.version} - -Dip=${buildEnv.env.extendedServices.ip} - -Dport=${buildEnv.env.extendedServices.port} - -DkieSandboxUrl=${buildEnv.env.extendedServices.kieSandboxUrl} + -Drevision=${buildEnv.env.extendedServicesJava.version} + -Dquarkus.http.port=${buildEnv.env.extendedServicesJava.port} + -Dquarkus.http.host=${buildEnv.env.extendedServicesJava.host} -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} `); diff --git a/packages/extended-services-java/package.json b/packages/extended-services-java/package.json index 9fb00d85a7..9c9bf44d5b 100644 --- a/packages/extended-services-java/package.json +++ b/packages/extended-services-java/package.json @@ -22,10 +22,15 @@ "build:prod": "run-script-os", "build:prod:linux:darwin": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -DskipITs=$(build-env endToEndTests.run --not) && pnpm dist", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-DskipITs=$(build-env endToEndTests.run --not)\" && pnpm dist", - "copy:jar": "copyfiles -u 1 \"target/*.jar\" dist/", - "dist": "rimraf dist && mkdir dist && pnpm copy:jar", + "copy:app": "run-script-os", + "copy:app:linux:darwin": "copyfiles -u 1 \"target/quarkus-app/**/*\" dist/", + "copy:app:win32": "copyfiles -u 1 \"target/quarkus-app/**\" dist/", + "dist": "rimraf dist && mkdir dist && pnpm copy:app && pnpm rename:app", "install": "node install.js", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", + "rename:app": "run-script-os", + "rename:app:linux:darwin": "mv dist/quarkus-app dist/extended-services-java", + "rename:app:win32": "ren dist\\quarkus-app extended-services-java", "start": "mvn quarkus:dev" }, "devDependencies": { diff --git a/packages/extended-services-java/pom.xml b/packages/extended-services-java/pom.xml index 4cd19046d8..19ab2608c7 100644 --- a/packages/extended-services-java/pom.xml +++ b/packages/extended-services-java/pom.xml @@ -100,6 +100,15 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + </resources> <plugins> <plugin> <groupId>io.quarkus</groupId> @@ -120,9 +129,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${compiler-plugin.version}</version> <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> + <parameters>${maven.compiler.parameters}</parameters> </configuration> </plugin> <plugin> diff --git a/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java b/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java index 4381a3ed23..dc6208f6c9 100644 --- a/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java +++ b/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java @@ -21,28 +21,20 @@ package org.kie.tools; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import org.eclipse.microprofile.config.inject.ConfigProperty; + import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; @ApplicationScoped -@JsonPropertyOrder({ "version", "proxy", "kieSandboxUrl", "started" }) +@JsonPropertyOrder({ "version", "started" }) public class PingResponse { private final String version; - private final ProxyConfig proxyConfig; - private final String kieSandboxUrl; private final boolean started; - @Inject - public PingResponse(@ConfigProperty(name = "extended.services.version") String version, - ProxyConfig proxyConfig, - @ConfigProperty(name = "kie.sandbox.url") String kieSandboxUrl) { + public PingResponse(@ConfigProperty(name = "extendedServicesJava.version")final String version) { this.version = version; - this.proxyConfig = proxyConfig; - this.kieSandboxUrl = kieSandboxUrl; this.started = true; } @@ -51,16 +43,6 @@ public class PingResponse { return version; } - @JsonProperty("proxy") - public ProxyConfig getProxyConfig() { - return proxyConfig; - } - - @JsonProperty("kieSandboxUrl") - public String getKieSandboxUrl() { - return kieSandboxUrl; - } - @JsonProperty("started") public boolean getStarted() { return started; diff --git a/packages/extended-services-java/src/main/java/org/kie/tools/ProxyConfig.java b/packages/extended-services-java/src/main/java/org/kie/tools/ProxyConfig.java deleted file mode 100644 index c9e7cac62d..0000000000 --- a/packages/extended-services-java/src/main/java/org/kie/tools/ProxyConfig.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.kie.tools; - -import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.microprofile.config.inject.ConfigProperty; - -import javax.enterprise.context.ApplicationScoped; - -@ApplicationScoped -public class ProxyConfig { - - private final String ip; - private final String port; - private final boolean insecureSkipVerify; - - public ProxyConfig(@ConfigProperty(name = "quarkus.http.host") String ip, - @ConfigProperty(name = "quarkus.http.port") String port) { - this.ip = ip; - this.port = port; - this.insecureSkipVerify = false; - } - - @JsonProperty("ip") - public String getIP() { - return ip; - } - - @JsonProperty("port") - public String getPort() { - return port; - } - - @JsonProperty("insecureSkipVerify") - public boolean getInsecureSkipVerify() { - return insecureSkipVerify; - } -} diff --git a/packages/extended-services-java/src/main/resources/application.properties b/packages/extended-services-java/src/main/resources/application.properties index 335b11160a..180d2b6563 100644 --- a/packages/extended-services-java/src/main/resources/application.properties +++ b/packages/extended-services-java/src/main/resources/application.properties @@ -15,10 +15,7 @@ # specific language governing permissions and limitations # under the License. -quarkus.http.host=${ip} -quarkus.http.port=${port} quarkus.http.cors=true quarkus.http.cors.origins=/.*/ -kie.sandbox.url=${kieSandboxUrl} -extended.services.version=${revision} \ No newline at end of file +extendedServicesJava.version=${project.version} \ No newline at end of file diff --git a/packages/extended-services-java/src/test/java/org/kie/tools/ProxyConfigTest.java b/packages/extended-services-java/src/test/java/org/kie/tools/AbstractPingTest.java similarity index 55% rename from packages/extended-services-java/src/test/java/org/kie/tools/ProxyConfigTest.java rename to packages/extended-services-java/src/test/java/org/kie/tools/AbstractPingTest.java index 3e7bcfccdf..bc15bc3a0f 100644 --- a/packages/extended-services-java/src/test/java/org/kie/tools/ProxyConfigTest.java +++ b/packages/extended-services-java/src/test/java/org/kie/tools/AbstractPingTest.java @@ -19,28 +19,9 @@ package org.kie.tools; -import io.quarkus.test.junit.QuarkusTest; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.Test; -import javax.inject.Inject; -import static org.junit.jupiter.api.Assertions.assertEquals; - -@QuarkusTest -public class ProxyConfigTest { - - @ConfigProperty(name = "quarkus.http.host") - String expectedIp; - @ConfigProperty(name = "quarkus.http.port") - String expectedPort; - boolean expectedInsecureSkipVerify = false; - - @Inject - ProxyConfig proxyConfig; - - @Test - public void testProxyConfig() { - assertEquals(expectedIp, proxyConfig.getIP()); - assertEquals(expectedPort, proxyConfig.getPort()); - assertEquals(expectedInsecureSkipVerify, proxyConfig.getInsecureSkipVerify()); - } -} +public class AbstractPingTest { + @ConfigProperty(name = "extendedServicesJava.version") + String expectedVersion; + final boolean expectedStarted = true; +} \ No newline at end of file diff --git a/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java b/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java index 853ca754ea..7734728d7f 100644 --- a/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java +++ b/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java @@ -17,45 +17,29 @@ * under the License. */ -package org.kie.tools; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.http.ContentType; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.Test; - -import javax.inject.Inject; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.*; - -@QuarkusTest -public class PingResourceTest { - - @ConfigProperty(name = "extended.services.version") - String expectedVersion; - @ConfigProperty(name = "quarkus.http.host") - String expectedIp; - @ConfigProperty(name = "quarkus.http.port") - String expectedPort; - boolean expectedInsecureSkipVerify = false; - @ConfigProperty(name = "kie.sandbox.url") - String expectedKieSandboxUrl; - boolean expectedStarted = true; - - @Test - public void testPingEndpoint() { - given() - .when().get("/ping") - .then() - .statusCode(200) - .contentType(ContentType.JSON) - .body("version", equalTo(expectedVersion)) - .body("proxy.ip", equalTo(expectedIp)) - .body("proxy.port", equalTo(expectedPort)) - .body("proxy.insecureSkipVerify", equalTo(expectedInsecureSkipVerify)) - .body("kieSandboxUrl", equalTo(expectedKieSandboxUrl)) - .body("started", equalTo(expectedStarted)); - } - -} \ No newline at end of file + package org.kie.tools; + + import io.quarkus.test.junit.QuarkusTest; + import io.restassured.http.ContentType; + import org.eclipse.microprofile.config.inject.ConfigProperty; + import org.junit.jupiter.api.Test; + + import javax.inject.Inject; + + import static io.restassured.RestAssured.given; + import static org.hamcrest.Matchers.*; + + @QuarkusTest + public class PingResourceTest extends AbstractPingTest { + @Test + public void testPingEndpoint() { + given() + .when().get("/ping") + .then() + .statusCode(200) + .contentType(ContentType.JSON) + .body("version", equalTo(expectedVersion)) + .body("started", equalTo(expectedStarted)); + } + + } \ No newline at end of file diff --git a/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java b/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java index 8cf1ea14fe..e4395d0daa 100644 --- a/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java +++ b/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java @@ -17,52 +17,27 @@ * under the License. */ -package org.kie.tools; - -import io.quarkus.test.junit.QuarkusTest; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.Test; -import javax.inject.Inject; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -@QuarkusTest -public class PingResponseTest { - - @ConfigProperty(name = "extended.services.version") - String expectedVersion; - @ConfigProperty(name = "quarkus.http.host") - String expectedIp; - @ConfigProperty(name = "quarkus.http.port") - String expectedPort; - boolean expectedInsecureSkipVerify = false; - @ConfigProperty(name = "kie.sandbox.url") - String expectedKieSandboxUrl; - boolean expectedStarted = true; - - @Inject - PingResponse pingResponse; - - @Test - public void testGetVersion() { - assertEquals(expectedVersion, pingResponse.getVersion()); - } - - @Test - public void testGetProxyConfig() { - ProxyConfig proxyConfig = pingResponse.getProxyConfig(); - assertEquals(expectedIp, proxyConfig.getIP()); - assertEquals(expectedPort, proxyConfig.getPort()); - assertEquals(expectedInsecureSkipVerify, proxyConfig.getInsecureSkipVerify()); - } - - @Test - public void testGetKieSandboxUrl() { - assertEquals(expectedKieSandboxUrl, pingResponse.getKieSandboxUrl()); - } - - @Test - public void testGetStarted() { - assertEquals(expectedStarted, pingResponse.getStarted()); - } -} + package org.kie.tools; + + import io.quarkus.test.junit.QuarkusTest; + import org.eclipse.microprofile.config.inject.ConfigProperty; + import org.junit.jupiter.api.Test; + import javax.inject.Inject; + + import static org.junit.jupiter.api.Assertions.assertEquals; + + @QuarkusTest + public class PingResponseTest extends AbstractPingTest { + @Inject + PingResponse pingResponse; + + @Test + public void testGetVersion() { + assertEquals(expectedVersion, pingResponse.getVersion()); + } + + @Test + public void testGetStarted() { + assertEquals(expectedStarted, pingResponse.getStarted()); + } + } \ No newline at end of file diff --git a/packages/kie-sandbox-distribution/README.md b/packages/kie-sandbox-distribution/README.md index 64ad6427a6..8de5d76bcb 100644 --- a/packages/kie-sandbox-distribution/README.md +++ b/packages/kie-sandbox-distribution/README.md @@ -17,7 +17,7 @@ This package contains the `docker-compose` file to run KIE Sandbox and all relat - For local builds, Run the following in the root folder of the repository to build the package: ```bash - pnpm -F @kie-tools/kie-sandbox-image... build:prod + pnpm -F @kie-tools/kie-sandbox-distribution... build:prod ``` - Then check if the image is correctly stored: diff --git a/packages/kie-sandbox-distribution/docker-compose.yaml b/packages/kie-sandbox-distribution/docker-compose.yaml index ed4ce362f0..3907d327ca 100644 --- a/packages/kie-sandbox-distribution/docker-compose.yaml +++ b/packages/kie-sandbox-distribution/docker-compose.yaml @@ -10,11 +10,11 @@ services: KIE_SANDBOX_CORS_PROXY_URL: "http://localhost:${KIE_SANDBOX_DISTRIBUTION__corsProxyExposedPort}"; depends_on: - - extended_services + - extended_services_java - cors_proxy - extended_services: - container_name: extended_services + extended_services_java: + container_name: extended_services_java image: "${KIE_SANDBOX_DISTRIBUTION__extendedServicesImageRegistry}/${KIE_SANDBOX_DISTRIBUTION__extendedServicesImageAccount}/${KIE_SANDBOX_DISTRIBUTION__extendedServicesImageName}:${KIE_SANDBOX_DISTRIBUTION__extendedServicesImageTag}" ports: - ${KIE_SANDBOX_DISTRIBUTION__extendedServicesExposedPort}:${KIE_SANDBOX_DISTRIBUTION__extendedServicesContainerPort} diff --git a/packages/kie-sandbox-distribution/tests/integrationTest.test.js b/packages/kie-sandbox-distribution/tests/integrationTest.test.js index 9bb8de1706..ef73362707 100644 --- a/packages/kie-sandbox-distribution/tests/integrationTest.test.js +++ b/packages/kie-sandbox-distribution/tests/integrationTest.test.js @@ -16,8 +16,11 @@ describe("Test built images individually", async () => { it("extended-services homepage", async () => { expect(await (await fetch(extendedServicesUrl)).text()).toMatchSnapshot(); }); - it("extended-services ping", async () => { - expect(await (await fetch(`${extendedServicesUrl}/ping`)).json()).toHaveProperty("proxy"); + it("extended-services-java ping", async () => { + const response = await (await fetch(`${extendedServicesUrl}/ping`)).json(); + expect(response).toHaveProperty("version"); + expect(response).toHaveProperty("started"); + expect(response.started).toBe(true); }); it("kie-sandbox homepage", async () => { expect(await (await fetch(kieSandboxUrl)).text()).toContain('<script src="index.js"></script>'); diff --git a/packages/kie-sandbox-extended-services-image/Containerfile b/packages/kie-sandbox-extended-services-image/Containerfile index b5f82e8ab7..7912315e4b 100644 --- a/packages/kie-sandbox-extended-services-image/Containerfile +++ b/packages/kie-sandbox-extended-services-image/Containerfile @@ -15,17 +15,27 @@ # specific language governing permissions and limitations # under the License. -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/openjdk-11-runtime:1.16-3 -RUN mkdir /kie-sandbox /.cache \ - && chgrp -R 0 /kie-sandbox /.cache \ - && chmod -R g=u /kie-sandbox /.cache \ - && chown -R 1000:0 /kie-sandbox /.cache +ARG EXTENDED_SERVICES_DEFAULT_HOST +ARG EXTENDED_SERVICES_DEFAULT_PORT -COPY --chown=1000:0 dist-dev/kie_sandbox_extended_services_headless /kie-sandbox/kie_sandbox_extended_services_headless +ENV EXTENDED_SERVICES_HOST=$EXTENDED_SERVICES_DEFAULT_HOST +ENV EXTENDED_SERVICES_PORT=$EXTENDED_SERVICES_DEFAULT_PORT -EXPOSE 21345 +RUN echo EXTENDED_SERVICES_DEFAULT_HOST: $EXTENDED_SERVICES_DEFAULT_HOST +RUN echo EXTENDED_SERVICES_DEFAULT_PORT: $EXTENDED_SERVICES_DEFAULT_PORT +RUN echo EXTENDED_SERVICES_HOST: $EXTENDED_SERVICES_HOST +RUN echo EXTENDED_SERVICES_PORT: $EXTENDED_SERVICES_PORT + +RUN mkdir kie-sandbox + +COPY --chown=1000:0 dist-dev/kie_sandbox_extended_services /kie-sandbox/kie_sandbox_extended_services + +EXPOSE $EXTENDED_SERVICES_PORT USER 1000 -CMD [ "/kie-sandbox/kie_sandbox_extended_services_headless" ] +WORKDIR /kie-sandbox/kie_sandbox_extended_services + +CMD java -Dquarkus.http.host=$EXTENDED_SERVICES_HOST -Dquarkus.http.port=$EXTENDED_SERVICES_PORT -jar quarkus-run.jar \ No newline at end of file diff --git a/packages/kie-sandbox-extended-services-image/README.md b/packages/kie-sandbox-extended-services-image/README.md index 9c97cfecf4..9a9666b860 100644 --- a/packages/kie-sandbox-extended-services-image/README.md +++ b/packages/kie-sandbox-extended-services-image/README.md @@ -58,3 +58,20 @@ $ podman run -p 21345:21345 -i --rm quay.io/kie-tools/kie-sandbox-extended-servi ``` The service will be up at http://localhost:21345 + +If you need to change port or Host/IP, use the following parameters: + +EXTENDED_SERVICES_HOST (Defaults to 0.0.0.0) +EXTENDED_SERVICES_PORT (Defaults to 21345) + +For example: + +```bash +$ docker run -p 21000:22222 -i --rm -e EXTENDED_SERVICES_HOST=127.0.0.1 -e EXTENDED_SERVICES_PORT=22222 quay.io/kie-tools/kie-sandbox-extended-services-image:latest +``` + +or + +```bash +$ podman run -p 21000:22222 -i --rm -e EXTENDED_SERVICES_HOST=127.0.0.1 -e EXTENDED_SERVICES_PORT=22222 quay.io/kie-tools/kie-sandbox-extended-services-image:latest +``` diff --git a/packages/kie-sandbox-extended-services-image/env/index.js b/packages/kie-sandbox-extended-services-image/env/index.js index 471244a938..120ed870e8 100644 --- a/packages/kie-sandbox-extended-services-image/env/index.js +++ b/packages/kie-sandbox-extended-services-image/env/index.js @@ -19,7 +19,7 @@ const { varsWithName, getOrDefault, composeEnv } = require("@kie-tools-scripts/build-env"); -module.exports = composeEnv([require("@kie-tools/root-env/env")], { +module.exports = composeEnv([require("@kie-tools/root-env/env"), require("@kie-tools/extended-services-java/env")], { vars: varsWithName({ KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry: { default: "quay.io", diff --git a/packages/kie-sandbox-extended-services-image/package.json b/packages/kie-sandbox-extended-services-image/package.json index d1068caf43..c4520129e2 100644 --- a/packages/kie-sandbox-extended-services-image/package.json +++ b/packages/kie-sandbox-extended-services-image/package.json @@ -16,15 +16,15 @@ "build:dev": "pnpm cleanup && pnpm copy:assets && run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm docker:build\"", "build:prod": "pnpm cleanup && pnpm copy:assets && run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm docker:build\"", "cleanup": "rimraf dist-dev && mkdir dist-dev", - "copy:assets": "pnpm copy:extended-services", - "copy:extended-services": "run-script-os", - "copy:extended-services:linux:darwin": "cp -R ../extended-services/dist/linux/kie_sandbox_extended_services_headless ./dist-dev/kie_sandbox_extended_services_headless", - "copy:extended-services:win32": "pnpm powershell \"Copy-Item ../extended-services/dist/linux/kie_sandbox_extended_services_headless ./dist-dev/kie_sandbox_extended_services_headless\"", - "docker:build": "kie-tools--image-builder -r \"$(build-env extendedServicesImage.registry)\" -a \"$(build-env extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\" -t \"$(build-env extendedServicesImage.buildTags)\"", - "podman:build": "kie-tools--image-builder -r \"$(build-env extendedServicesImage.registry)\" -a \"$(build-env extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\" -t \"$(build-env extendedServicesImage.buildTags)\" -e podman" + "copy:assets": "pnpm copy:extended-services-java", + "copy:extended-services-java": "run-script-os", + "copy:extended-services-java:linux:darwin": "cp -R ../extended-services-java/dist/extended-services-java ./dist-dev/kie_sandbox_extended_services", + "copy:extended-services-java:win32": "pnpm powershell \"Copy-Item ../extended-services-java/dist/extended-services-java ./dist-dev/kie_sandbox_extended_services\"", + "docker:build": "kie-tools--image-builder -r \"$(build-env extendedServicesImage.registry)\" -a \"$(build-env extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\" -t \"$(build-env extendedServicesImage.buildTags)\" --build-arg \"EXTENDED_SERVICES_DEFAULT_PORT=$(build-env extendedServicesJava.port)\" --build-arg \"EXTENDED_SERVICES_DEFAULT_HOST=$(build-env extendedServicesJava.host)\"", + "podman:build": "kie-tools--image-builder -r \"$(build-env extendedServicesImage.registry)\" -a \"$(build-env extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\" -t \"$(build-env extendedServicesImage.buildTags)\" --build-arg \"EXTENDED_SERVICES_DEFAULT_PORT=$(build-env extendedServicesJava.port)\" --build-arg \"EXTENDED_SERVICES_DEFAULT_HOST=$(build-env extendedServicesJava.host)\" -e podman" }, "dependencies": { - "@kie-tools/extended-services": "workspace:*" + "@kie-tools/extended-services-java": "workspace:*" }, "devDependencies": { "@kie-tools/image-builder": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aec758786e..26525f14ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5163,9 +5163,9 @@ importers: packages/kie-sandbox-extended-services-image: dependencies: - "@kie-tools/extended-services": + "@kie-tools/extended-services-java": specifier: workspace:* - version: link:../extended-services + version: link:../extended-services-java devDependencies: "@kie-tools/image-builder": specifier: workspace:* diff --git a/repo/graph.dot b/repo/graph.dot index 402d0775ac..96fc6b4494 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -324,7 +324,7 @@ digraph G { "@kie-tools/kie-sandbox-distribution" -> "@kie-tools/cors-proxy-image" [ style = "solid", color = "black" ]; "@kie-tools/kie-sandbox-distribution" -> "@kie-tools/kie-sandbox-extended-services-image" [ style = "solid", color = "black" ]; "@kie-tools/kie-sandbox-distribution" -> "@kie-tools/kie-sandbox-image" [ style = "solid", color = "black" ]; - "@kie-tools/kie-sandbox-extended-services-image" -> "@kie-tools/extended-services" [ style = "solid", color = "black" ]; + "@kie-tools/kie-sandbox-extended-services-image" -> "@kie-tools/extended-services-java" [ style = "solid", color = "black" ]; "@kie-tools/kie-sandbox-extended-services-image" -> "@kie-tools/image-builder" [ style = "dashed", color = "black" ]; "@kie-tools/kie-sandbox-fs" -> "@kie-tools/root-env" [ style = "dashed", color = "blue" ]; "@kie-tools/kie-sandbox-fs" -> "@kie-tools/tsconfig" [ style = "dashed", color = "blue" ]; diff --git a/repo/graph.json b/repo/graph.json index a1dd70e9e3..a58c636554 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -692,7 +692,7 @@ { "source": "@kie-tools/kie-sandbox-distribution", "target": "@kie-tools/kie-sandbox-image", "weight": 1 }, { "source": "@kie-tools/kie-sandbox-extended-services-image", - "target": "@kie-tools/extended-services", + "target": "@kie-tools/extended-services-java", "weight": 1 }, { "source": "@kie-tools/kie-sandbox-extended-services-image", "target": "@kie-tools/image-builder", "weight": 1 }, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
