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 a403f6f7c83 kie-issues#389: Include environment variables on all KIE
Sandbox-related images to configure the port used (#2225)
a403f6f7c83 is described below
commit a403f6f7c83926bc73020cabf492bcb35eb6feb4
Author: Wagner Scholl Lemos <[email protected]>
AuthorDate: Tue Apr 16 17:17:04 2024 -0300
kie-issues#389: Include environment variables on all KIE Sandbox-related
images to configure the port used (#2225)
---
packages/cors-proxy-image/Containerfile | 17 +++++++++------
packages/cors-proxy-image/README.md | 25 ++++------------------
packages/cors-proxy-image/env/index.js | 17 +++++++++++++++
packages/cors-proxy-image/package.json | 4 ++--
packages/cors-proxy/README.md | 3 +++
packages/cors-proxy/package.json | 4 ++--
packages/kie-sandbox-distribution/env/index.js | 4 ++--
.../Containerfile | 8 +++----
.../kie-sandbox-extended-services-image/README.md | 20 +----------------
.../env/index.js | 9 +++++++-
.../package.json | 4 ++--
packages/kie-sandbox-image/Containerfile | 16 ++++++++------
packages/kie-sandbox-image/README.md | 1 +
packages/kie-sandbox-image/entrypoint.sh | 2 +-
packages/kie-sandbox-image/env/index.js | 5 +++++
packages/kie-sandbox-image/package.json | 4 ++--
packages/online-editor/README.md | 2 +-
packages/online-editor/env/index.js | 2 +-
18 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/packages/cors-proxy-image/Containerfile
b/packages/cors-proxy-image/Containerfile
index 9793d9e9fa5..622f31f3221 100644
--- a/packages/cors-proxy-image/Containerfile
+++ b/packages/cors-proxy-image/Containerfile
@@ -17,27 +17,32 @@
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3
+ARG CORS_PROXY_DEFAULT_PORT=8080
+ARG CORS_PROXY_DEFAULT_ORIGIN=*
+ARG CORS_PROXY_DEFAULT_VERBOSE=false
+
ENV HOME /home/kie-sandbox
ENV NVM_DIR $HOME/.nvm
ENV NODE_VERSION v20.8.1
-ENV CORS_PROXY_ORIGIN=*
-ENV CORS_PROXY_VERBOSE=false
-
RUN mkdir $HOME \
&& chgrp -R 0 $HOME \
&& chmod -R g=u $HOME \
&& chown -R 1000:0 $HOME \
&& microdnf install -y tar-2:1.34-6.el9_1.x86_64 gzip-1.12-1.el9.x86_64 \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh
| bash \
- && /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION"
+ && /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION" \
+ && export CORS_PROXY_HTTP_PORT=$CORS_PROXY_DEFAULT_PORT \
+ && export CORS_PROXY_ORIGIN=CORS_PROXY_DEFAULT_ORIGIN \
+ && export CORS_PROXY_VERBOSE=CORS_PROXY_DEFAULT_VERBOSE
+
ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/bin
-ENV PATH $NODE_PATH:$PATH
+ENV PATH $NODE_PATH:$PATH
COPY --chown=1000:0 dist-dev/cors-proxy $HOME/cors-proxy
-EXPOSE 8080
+EXPOSE $CORS_PROXY_DEFAULT_PORT
USER 1000
diff --git a/packages/cors-proxy-image/README.md
b/packages/cors-proxy-image/README.md
index c1d0ab449c1..3ab9086afb7 100644
--- a/packages/cors-proxy-image/README.md
+++ b/packages/cors-proxy-image/README.md
@@ -14,13 +14,16 @@ Enable the image to be built:
$ export KIE_TOOLS_BUILD__buildContainerImages=true
```
-The image name and tags can be customized by setting the following environment
variables:
+The image name, tags and port can be customized by setting the following
environment variables:
```bash
$ export CORS_PROXY_IMAGE__imageRegistry=<registry>
$ export CORS_PROXY_IMAGE__imageAccount=<account>
$ export CORS_PROXY_IMAGE__imageName=<image-name>
$ export CORS_PROXY_IMAGE__imageBuildTags=<image-tags>
+$ export CORS_PROXY_IMAGE__imagePort=<port>
+$ export CORS_PROXY_IMAGE__imageOrigin=<origin>
+$ export CORS_PROXY_IMAGE__imageVerbose=<verbose>
```
Default values can be found [here](./env/index.js).
@@ -58,23 +61,3 @@ $ podman run -p 8080:8080 -i --rm
quay.io/kie-tools/cors-proxy-image:latest
```
The service will be up at http://localhost:8080
-
-### Container configuration
-
-It's possible to configure certain parameters of the container using the
following env variables:
-
-- _CORS_PROXY_ORIGIN_: Sets the value of the 'Access-Control-Allow-Origin'
header, defaults to `*`
-- _CORS_PROXY_VERBOSE_: Allows the proxy to run in verbose mode... useful to
trace requests on development environments. Defaults to `false`
-
-For example setting an `.env` file like:
-
-```bash
-CORS_PROXY_ORIGIN=*
-CORS_PROXY_VERBOSE=false
-```
-
-or by passing the variables as arguments like
-
-```bash
-$ docker run -p 8080:8080 -e CORS_PROXY_ORIGIN=* -e CORS_PROXY_VERBOSE=false
-i --rm quay.io/kie-tools/cors-proxy-image:latest
-```
diff --git a/packages/cors-proxy-image/env/index.js
b/packages/cors-proxy-image/env/index.js
index 169dcd1e521..869b7b7da6a 100644
--- a/packages/cors-proxy-image/env/index.js
+++ b/packages/cors-proxy-image/env/index.js
@@ -19,6 +19,8 @@
const { varsWithName, getOrDefault, composeEnv } =
require("@kie-tools-scripts/build-env");
+const corsProxyEnv = require("@kie-tools/cors-proxy/env");
+
module.exports = composeEnv([require("@kie-tools/root-env/env")], {
vars: varsWithName({
CORS_PROXY_IMAGE__imageRegistry: {
@@ -37,6 +39,18 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
default: "latest",
description: "",
},
+ CORS_PROXY_IMAGE__imagePort: {
+ default: corsProxyEnv.env.corsProxy.dev.port,
+ description: "",
+ },
+ CORS_PROXY_IMAGE__imageOrigin: {
+ default: corsProxyEnv.env.corsProxy.dev.origin,
+ description: "",
+ },
+ CORS_PROXY_IMAGE__imageVerbose: {
+ default: false,
+ description: "",
+ },
}),
get env() {
return {
@@ -46,6 +60,9 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
account: getOrDefault(this.vars.CORS_PROXY_IMAGE__imageAccount),
name: getOrDefault(this.vars.CORS_PROXY_IMAGE__imageName),
buildTags: getOrDefault(this.vars.CORS_PROXY_IMAGE__imageBuildTags),
+ port: getOrDefault(this.vars.CORS_PROXY_IMAGE__imagePort),
+ origin: getOrDefault(this.vars.CORS_PROXY_IMAGE__imageOrigin),
+ verbose: getOrDefault(this.vars.CORS_PROXY_IMAGE__imageVerbose),
},
},
};
diff --git a/packages/cors-proxy-image/package.json
b/packages/cors-proxy-image/package.json
index 2282a35d181..398e3b4effd 100644
--- a/packages/cors-proxy-image/package.json
+++ b/packages/cors-proxy-image/package.json
@@ -19,8 +19,8 @@
"copy:cors-proxy-package": "run-script-os",
"copy:cors-proxy-package:linux:darwin": "cp -R
./node_modules/@kie-tools/cors-proxy/dist/ dist-dev/cors-proxy/",
"copy:cors-proxy-package:win32": "pnpm powershell \"Copy-Item -R
./node_modules/@kie-tools/cors-proxy/dist/ dist-dev/cors-proxy/\"",
- "docker:build": "kie-tools--image-builder build -r \"$(build-env
corsProxyImage.image.registry)\" -a \"$(build-env
corsProxyImage.image.account)\" -n \"$(build-env corsProxyImage.image.name)\"
-t \"$(build-env corsProxyImage.image.buildTags)\"",
- "podman:build": "kie-tools--image-builder build -r \"$(build-env
corsProxyImage.image.registry)\" -a \"$(build-env
corsProxyImage.image.account)\" -n \"$(build-env corsProxyImage.image.name)\"
-t \"$(build-env corsProxyImage.image.buildTags)\" -e podman"
+ "docker:build": "kie-tools--image-builder build -r \"$(build-env
corsProxyImage.image.registry)\" -a \"$(build-env
corsProxyImage.image.account)\" -n \"$(build-env corsProxyImage.image.name)\"
-t \"$(build-env corsProxyImage.image.buildTags)\" --build-arg
\"CORS_PROXY_DEFAULT_HTTP_PORT=$(build-env corsProxyImage.image.port)\"
--build-arg \"CORS_PROXY_DEFAULT_ORIGIN=$(build-env
corsProxyImage.image.origin)\" --build-arg
\"CORS_PROXY_DEFAULT_VERBOSE=$(build-env corsProxyImage.image.ver [...]
+ "podman:build": "kie-tools--image-builder build -r \"$(build-env
corsProxyImage.image.registry)\" -a \"$(build-env
corsProxyImage.image.account)\" -n \"$(build-env corsProxyImage.image.name)\"
-t \"$(build-env corsProxyImage.image.buildTags)\" --build-arg
\"CORS_PROXY_DEFAULT_HTTP_PORT=$(build-env corsProxyImage.image.port)\"
--build-arg \"CORS_PROXY_DEFAULT_ORIGIN=$(build-env
corsProxyImage.image.origin)\" --build-arg
\"CORS_PROXY_DEFAULT_VERBOSE=$(build-env corsProxyImage.image.ver [...]
},
"devDependencies": {
"@kie-tools/cors-proxy": "workspace:*",
diff --git a/packages/cors-proxy/README.md b/packages/cors-proxy/README.md
index 68e15bfd23d..21937d02cae 100644
--- a/packages/cors-proxy/README.md
+++ b/packages/cors-proxy/README.md
@@ -12,12 +12,14 @@ $ pnpm @kie-tools/cors-proxy... build:prod
The `cors-proxy` can be configured via environment variables:
+- _CORS_PROXY_HTTP_PORT_: Sets the HTTP Port the proxy should listen to
- _CORS_PROXY_ORIGIN_: Sets the value of the 'Access-Control-Allow-Origin'
header, defaults to `*`
- _CORS_PROXY_VERBOSE_: Allows the proxy to run in verbose mode... useful to
trace requests on development environments. Defaults to `false`
For example:
```bash
+$ export CORS_PROXY_HTTP_PORT=8080
$ export CORS_PROXY_ORIGIN=*
$ export CORS_PROXY_VERBOSE=false
```
@@ -39,6 +41,7 @@ $ pnpm @kie-tools/cors-proxy start
You can also use the following envs to configure `cors-proxy` when starting in
dev-mode:
```bash
+$ export CORS_PROXY__port=*
$ export CORS_PROXY__origin=*
$ export CORS_PROXY__verbose=false
```
diff --git a/packages/cors-proxy/package.json b/packages/cors-proxy/package.json
index 8a254ead515..3c714f7f67d 100644
--- a/packages/cors-proxy/package.json
+++ b/packages/cors-proxy/package.json
@@ -21,8 +21,8 @@
"build:prod": "pnpm lint && pnpm test && rimraf dist && webpack",
"lint": "run-script-if --bool \"$(build-env linters.run)\" --then
\"kie-tools--eslint ./src\"",
"start": "run-script-os",
- "start:darwin:linux": "pnpm build:dev && cross-env
CORS_PROXY_HTTP_PORT=$(build-env corsProxy.dev.port)
CORS_PROXY_VERBOSE=$(build-env corsProxy.dev.verbose) node dist/index.js",
- "start:win32": "pnpm build:dev && pnpm powershell \"cross-env
CORS_PROXY_HTTP_PORT=$(build-env corsProxy.dev.port)
CORS_PROXY_VERBOSE=$(build-env corsProxy.dev.verbose) node dist/index.js\"",
+ "start:darwin:linux": "pnpm build:dev && cross-env
CORS_PROXY_HTTP_PORT=$(build-env corsProxy.dev.port)
CORS_PROXY_ORIGIN=$(build-env corsProxy.dev.oring)
CORS_PROXY_VERBOSE=$(build-env corsProxy.dev.verbose) node dist/index.js",
+ "start:win32": "pnpm build:dev && pnpm powershell \"cross-env
CORS_PROXY_HTTP_PORT=$(build-env corsProxy.dev.port)
CORS_PROXY_ORIGIN=$(build-env corsProxy.dev.oring)
CORS_PROXY_VERBOSE=$(build-env corsProxy.dev.verbose) node dist/index.js\"",
"test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env tests.run)\" --then \"jest
--silent --verbose --passWithNoTests\""
},
"dependencies": {
diff --git a/packages/kie-sandbox-distribution/env/index.js
b/packages/kie-sandbox-distribution/env/index.js
index 8b4977171f8..1adc31cd7cb 100644
--- a/packages/kie-sandbox-distribution/env/index.js
+++ b/packages/kie-sandbox-distribution/env/index.js
@@ -43,7 +43,7 @@ module.exports = composeEnv([buildEnv,
extendedServicesImageEnv, corsProxyImageE
description: "",
},
KIE_SANDBOX_DISTRIBUTION__kieSandboxContainerPort: {
- default: "8080",
+ default: kieSandboxImageEnv.env.kieSandbox.image.port,
description: "",
},
KIE_SANDBOX_DISTRIBUTION__kieSandboxExposedPort: {
@@ -91,7 +91,7 @@ module.exports = composeEnv([buildEnv,
extendedServicesImageEnv, corsProxyImageE
description: "",
},
KIE_SANDBOX_DISTRIBUTION__corsProxyContainerPort: {
- default: "8080",
+ default: corsProxyImageEnv.env.corsProxyImage.image.port,
description: "",
},
KIE_SANDBOX_DISTRIBUTION__corsProxyExposedPort: {
diff --git a/packages/kie-sandbox-extended-services-image/Containerfile
b/packages/kie-sandbox-extended-services-image/Containerfile
index 6e82a94e890..e9113b1e9e6 100644
--- a/packages/kie-sandbox-extended-services-image/Containerfile
+++ b/packages/kie-sandbox-extended-services-image/Containerfile
@@ -20,18 +20,16 @@ ARG BUILDER_IMAGE_ARG
FROM --platform=linux/amd64 ${BUILDER_IMAGE_ARG}
-ARG EXTENDED_SERVICES_DEFAULT_HOST
-ARG EXTENDED_SERVICES_DEFAULT_PORT
+ARG EXTENDED_SERVICES_DEFAULT_PORT=21345
-ENV EXTENDED_SERVICES_HOST=$EXTENDED_SERVICES_DEFAULT_HOST
ENV EXTENDED_SERVICES_PORT=$EXTENDED_SERVICES_DEFAULT_PORT
COPY --chown=1000:0 dist-dev/kie_sandbox_extended_services
/kie-sandbox/kie_sandbox_extended_services
-EXPOSE $EXTENDED_SERVICES_PORT
+EXPOSE $EXTENDED_SERVICES_DEFAULT_PORT
USER 1000
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
+CMD java -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 8eb3353978e..344025ab37d 100644
--- a/packages/kie-sandbox-extended-services-image/README.md
+++ b/packages/kie-sandbox-extended-services-image/README.md
@@ -21,6 +21,7 @@ $ export
KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry=<registry>
$ export KIE_SANDBOX_EXTENDED_SERVICES__imageAccount=<account>
$ export KIE_SANDBOX_EXTENDED_SERVICES__imageName=<image-name>
$ export KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags=<image-tags>
+$ export KIE_SANDBOX_EXTENDED_SERVICES__imagePort=<port>
```
Default values can be found [here](../build-env/index.js).
@@ -58,22 +59,3 @@ $ 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:
-
-```bash
-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 f23e40fb748..44cdf4225f2 100644
--- a/packages/kie-sandbox-extended-services-image/env/index.js
+++ b/packages/kie-sandbox-extended-services-image/env/index.js
@@ -19,7 +19,9 @@
const { varsWithName, getOrDefault, composeEnv } =
require("@kie-tools-scripts/build-env");
-module.exports = composeEnv([require("@kie-tools/root-env/env"),
require("@kie-tools/extended-services-java/env")], {
+const extendedServicesJavaEnv =
require("@kie-tools/extended-services-java/env");
+
+module.exports = composeEnv([require("@kie-tools/root-env/env")], {
vars: varsWithName({
KIE_SANDBOX_EXTENDED_SERVICES__builderImage: {
default: "registry.access.redhat.com/ubi9/openjdk-17:1.18",
@@ -41,6 +43,10 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env"), require("@kie-t
default: "latest",
description: "",
},
+ KIE_SANDBOX_EXTENDED_SERVICES__imagePort: {
+ default: extendedServicesJavaEnv.env.extendedServicesJava.port,
+ description: "",
+ },
}),
get env() {
return {
@@ -50,6 +56,7 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env"), require("@kie-t
account:
getOrDefault(this.vars.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount),
name: getOrDefault(this.vars.KIE_SANDBOX_EXTENDED_SERVICES__imageName),
buildTags:
getOrDefault(this.vars.KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags),
+ port: getOrDefault(this.vars.KIE_SANDBOX_EXTENDED_SERVICES__imagePort),
},
};
},
diff --git a/packages/kie-sandbox-extended-services-image/package.json
b/packages/kie-sandbox-extended-services-image/package.json
index 4ce922d4a4f..6d40075a6d4 100644
--- a/packages/kie-sandbox-extended-services-image/package.json
+++ b/packages/kie-sandbox-extended-services-image/package.json
@@ -20,8 +20,8 @@
"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\"",
- "image:docker:build": "kie-tools--image-builder build -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)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env
extendedServicesIm [...]
- "image:podman:build": "kie-tools--image-builder build -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)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env
extendedServicesIm [...]
+ "image:docker:build": "kie-tools--image-builder build -r \"$(build-env
extendedServicesImage.registry)\" -a \"$(build-env
extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\"
-t \"$(build-env extendedServicesImage.buildTags)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env extendedServicesImage.builderImage)\"
--build-arg \"EXTENDED_SERVICES_DEFAULT_PORT=$(build-env
extendedServicesImage.port)\" ",
+ "image:podman:build": "kie-tools--image-builder build -r \"$(build-env
extendedServicesImage.registry)\" -a \"$(build-env
extendedServicesImage.account)\" -n \"$(build-env extendedServicesImage.name)\"
-t \"$(build-env extendedServicesImage.buildTags)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env extendedServicesImage.builderImage)\"
--build-arg \"EXTENDED_SERVICES_DEFAULT_PORT=$(build-env
extendedServicesImage.port)\" -e podman"
},
"dependencies": {
"@kie-tools/extended-services-java": "workspace:*"
diff --git a/packages/kie-sandbox-image/Containerfile
b/packages/kie-sandbox-image/Containerfile
index 4bc6325b81b..7083e360680 100644
--- a/packages/kie-sandbox-image/Containerfile
+++ b/packages/kie-sandbox-image/Containerfile
@@ -17,17 +17,19 @@
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3
+ARG KIE_SANDBOX_DEFAULT_PORT=8080
+
COPY entrypoint.sh dist-dev/image-env-to-json-standalone
dist-dev/EnvJson.schema.json /tmp/
RUN microdnf --disableplugin=subscription-manager -y install
httpd-2.4.57-5.el9.x86_64 \
&& microdnf --disableplugin=subscription-manager clean all \
&& echo "Mutex posixsem" >> /etc/httpd/conf/httpd.conf \
- && sed -i -e 's/Listen 80/Listen 8080/' /etc/httpd/conf/httpd.conf \
- && sed -i -e 's/#ServerName www.example.com:80/ServerName 127.0.0.1:8080/'
/etc/httpd/conf/httpd.conf \
- && sed -i -e "/ServerName 127.0.0.1:8080/aHeader set Content-Security-Policy
\"frame-ancestors 'self';\"" /etc/httpd/conf/httpd.conf \
- && sed -i -e 's/Options Indexes FollowSymLinks/Options -Indexes
+FollowSymLinks/' /etc/httpd/conf/httpd.conf \
- && sed -i '$ a ServerTokens Prod' /etc/httpd/conf/httpd.conf \
- && sed -i '$ a ServerSignature Off' /etc/httpd/conf/httpd.conf \
+ && sed -i "s/Listen 80/Listen $KIE_SANDBOX_DEFAULT_PORT/g"
/etc/httpd/conf/httpd.conf \
+ && sed -i "s/#ServerName www.example.com:80/ServerName
127.0.0.1:$KIE_SANDBOX_DEFAULT_PORT/g" /etc/httpd/conf/httpd.conf \
+ && sed -i -e "/ServerName 127.0.0.1:$KIE_SANDBOX_DEFAULT_PORT/aHeader set
Content-Security-Policy \"frame-ancestors 'self';\"" /etc/httpd/conf/httpd.conf
\
+ && sed -i -e "s/Options Indexes FollowSymLinks/Options -Indexes
+FollowSymLinks/" /etc/httpd/conf/httpd.conf \
+ && sed -i "$ a ServerTokens Prod" /etc/httpd/conf/httpd.conf \
+ && sed -i "$ a ServerSignature Off" /etc/httpd/conf/httpd.conf \
&& mkdir /kie-sandbox \
&& mv -t /kie-sandbox /tmp/entrypoint.sh /tmp/image-env-to-json-standalone
/tmp/EnvJson.schema.json \
&& chgrp -R 0 /var/log/httpd /var/run/httpd /var/www/html /kie-sandbox \
@@ -38,7 +40,7 @@ COPY dist-dev/online-editor /kie-sandbox/app
RUN if [ -f /kie-sandbox/app/env.json ]; then chmod a+w
/kie-sandbox/app/env.json; fi
-EXPOSE 8080
+EXPOSE $KIE_SANDBOX_DEFAULT_PORT
USER 1000
diff --git a/packages/kie-sandbox-image/README.md
b/packages/kie-sandbox-image/README.md
index 9d750304cc6..177da86fa25 100644
--- a/packages/kie-sandbox-image/README.md
+++ b/packages/kie-sandbox-image/README.md
@@ -21,6 +21,7 @@ This package contains the `Containerfile/Dockerfile` and
scripts to build a cont
export KIE_SANDBOX__imageAccount=<account>
export KIE_SANDBOX__imageName=<image-name>
export KIE_SANDBOX__imageBuildTags=<image-tags>
+ export KIE_SANDBOX__imagePort=<port>
```
> Default values can be found [here](./env/index.js).
diff --git a/packages/kie-sandbox-image/entrypoint.sh
b/packages/kie-sandbox-image/entrypoint.sh
index 89c701aa4f3..b1761030a03 100644
--- a/packages/kie-sandbox-image/entrypoint.sh
+++ b/packages/kie-sandbox-image/entrypoint.sh
@@ -6,4 +6,4 @@ cp -R /kie-sandbox/app/* /var/www/html
/kie-sandbox/image-env-to-json-standalone --directory /var/www/html
--json-schema /kie-sandbox/EnvJson.schema.json
-httpd -D FOREGROUND
+httpd -D FOREGROUND
\ No newline at end of file
diff --git a/packages/kie-sandbox-image/env/index.js
b/packages/kie-sandbox-image/env/index.js
index 287f1202975..9e4667b6409 100644
--- a/packages/kie-sandbox-image/env/index.js
+++ b/packages/kie-sandbox-image/env/index.js
@@ -37,6 +37,10 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
default: "latest",
description: "",
},
+ KIE_SANDBOX__imagePort: {
+ default: "8080",
+ description: "",
+ },
}),
get env() {
return {
@@ -46,6 +50,7 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
account: getOrDefault(this.vars.KIE_SANDBOX__imageAccount),
name: getOrDefault(this.vars.KIE_SANDBOX__imageName),
buildTags: getOrDefault(this.vars.KIE_SANDBOX__imageBuildTags),
+ port: getOrDefault(this.vars.KIE_SANDBOX__imagePort),
},
},
};
diff --git a/packages/kie-sandbox-image/package.json
b/packages/kie-sandbox-image/package.json
index 01b9035c84c..350ae39d4bf 100644
--- a/packages/kie-sandbox-image/package.json
+++ b/packages/kie-sandbox-image/package.json
@@ -24,8 +24,8 @@
"copy:online-editor:linux:darwin": "cp -R ../online-editor/dist
./dist-dev/online-editor",
"copy:online-editor:win32": "pnpm powershell \"Copy-Item -R
../online-editor/dist ./dist-dev/online-editor\"",
"env-json:schema:generate": "ts-json-schema-generator --path
./node_modules/@kie-tools/online-editor/src/env/EnvJson.ts --type EnvJson --id
EnvJson --out ./dist-dev/EnvJson.schema.json",
- "image:docker:build": "kie-tools--image-builder build -r \"$(build-env
kieSandbox.image.registry)\" -a \"$(build-env kieSandbox.image.account)\" -n
\"$(build-env kieSandbox.image.name)\" -t \"$(build-env
kieSandbox.image.buildTags)\"",
- "image:podman:build": "kie-tools--image-builder build -r \"$(build-env
kieSandbox.image.registry)\" -a \"$(build-env kieSandbox.image.account)\" -n
\"$(build-env kieSandbox.image.name)\" -t \"$(build-env
kieSandbox.image.buildTags)\" -e podman"
+ "image:docker:build": "kie-tools--image-builder build -r \"$(build-env
kieSandbox.image.registry)\" -a \"$(build-env kieSandbox.image.account)\" -n
\"$(build-env kieSandbox.image.name)\" -t \"$(build-env
kieSandbox.image.buildTags)\" --build-arg
\"KIE_SANDBOX_DEFAULT_PORT=$(build-env kieSandbox.image.port)\"",
+ "image:podman:build": "kie-tools--image-builder build -r \"$(build-env
kieSandbox.image.registry)\" -a \"$(build-env kieSandbox.image.account)\" -n
\"$(build-env kieSandbox.image.name)\" -t \"$(build-env
kieSandbox.image.buildTags)\" --build-arg
\"KIE_SANDBOX_DEFAULT_PORT=$(build-env kieSandbox.image.port)\" -e podman"
},
"dependencies": {
"@kie-tools/image-env-to-json": "workspace:*",
diff --git a/packages/online-editor/README.md b/packages/online-editor/README.md
index 4642fa202b2..c639b401c3a 100644
--- a/packages/online-editor/README.md
+++ b/packages/online-editor/README.md
@@ -14,7 +14,7 @@ More suitable for running particular tests from `e2e-tests`.
More suitable for running `e2e-tests` completely.
-- `packages/online-editor$ START_SERVER_AND_TEST_INSECURE=true
KOGITO_TOOLING_BUILD_testIT=true pnpm test:e2e`
+- `packages/online-editor$ KIE_TOOLS_BUILD__runEndToEndTests=true pnpm
test:e2e`
> **NOTE:**
> Before test development, you may need to build `online-editor` as:
diff --git a/packages/online-editor/env/index.js
b/packages/online-editor/env/index.js
index ed826116d33..1287d0fa621 100644
--- a/packages/online-editor/env/index.js
+++ b/packages/online-editor/env/index.js
@@ -62,7 +62,7 @@ module.exports = composeEnv(
description: "CORS Proxy URL.",
},
ONLINE_EDITOR__extendedServicesUrl: {
- default:
`http://localhost:${extendedServicesEnv.env.extendedServices.port}`,
+ default:
`http://${extendedServicesEnv.env.extendedServices.host}:${extendedServicesEnv.env.extendedServices.port}`,
description: "Extended Services URL.",
},
ONLINE_EDITOR__requireCustomCommitMessage: {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
