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 7bd689a6c40 [NO-ISSUE] Match `dev-deployment-kogito-quarkus-blank-app`
with published name on DockerHub (without `kogito` term) (#2969)
7bd689a6c40 is described below
commit 7bd689a6c403dc8da23afe53d354da239f292c29
Author: Tiago Bento <[email protected]>
AuthorDate: Tue Apr 15 16:59:47 2025 -0400
[NO-ISSUE] Match `dev-deployment-kogito-quarkus-blank-app` with published
name on DockerHub (without `kogito` term) (#2969)
---
.ci/jenkins/Jenkinsfile.daily-dev-publish | 26 +++++++++---------
.ci/jenkins/Jenkinsfile.release-build | 16 +++++------
...insfile.dev-deployment-quarkus-blank-app-image} | 22 +++++++--------
.ci/jenkins/release-jobs/Jenkinsfile.online-editor | 8 +++---
.rat-excludes | 4 +--
_intellij-project/.idea/misc.xml | 2 +-
_intellij-project/.idea/modules.xml | 2 +-
.../dev-deployment-dmn-form-webapp-image/README.md | 4 +--
packages/dev-deployment-dmn-form-webapp/README.md | 2 +-
.../Containerfile | 0
.../README.md | 6 ++--
.../env/index.js | 24 ++++++++--------
.../package.json | 22 +++++++--------
.../README.md | 4 ++-
.../dev-deployment-quarkus-blank-app.iml} | 0
.../env/index.js | 0
.../install.js | 0
.../package.json | 2 +-
.../pom.xml | 4 +--
.../src/main/resources/application.properties | 0
packages/kie-sandbox-webapp-image/README.md | 32 +++++++++++-----------
packages/online-editor/build/defaultEnvJson.ts | 4 +--
.../docs/DEV_DEPLOYMENTS_ARCHITECTURE.md | 8 +++---
packages/online-editor/env/index.js | 20 +++++++-------
.../online-editor/src/aboutModal/AboutButton.tsx | 6 ++--
.../DevDeploymentsConfirmDeployModal.tsx | 2 +-
.../customImage/DeploymentYaml.ts | 2 +-
.../DeploymentYaml.ts | 2 +-
.../FormWebappIngressYaml.ts | 0
.../FormWebappRouteYaml.ts | 0
.../FormWebappServiceYaml.ts | 0
.../IngressYaml.ts | 0
.../RouteYaml.ts | 0
.../ServiceYaml.ts | 0
.../index.ts | 4 +--
.../kubernetes/KubernetesDeploymentOptions.ts | 12 ++++----
.../openshift/OpenShiftDeploymentOptions.ts | 14 +++++-----
.../src/devDeployments/services/types.ts | 2 +-
packages/online-editor/src/env/EnvJson.ts | 2 +-
pnpm-lock.yaml | 8 +++---
repo/graph.dot | 12 ++++----
repo/graph.json | 21 ++++++--------
42 files changed, 149 insertions(+), 150 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish
b/.ci/jenkins/Jenkinsfile.daily-dev-publish
index 58ae08d81b0..2ff5dd2d12f 100644
--- a/.ci/jenkins/Jenkinsfile.daily-dev-publish
+++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -47,10 +47,10 @@ pipeline {
DEV_DEPLOYMENT_BASE_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-base'
DEV_DEPLOYMENT_BASE_IMAGE__buildTag = "${params.BRANCH_NAME}"
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag =
"${params.BRANCH_NAME}"
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag =
"${params.BRANCH_NAME}"
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry = 'docker.io'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account = 'apache'
@@ -65,10 +65,10 @@ pipeline {
ONLINE_EDITOR__devDeploymentDmnFormWebappImageAccount = 'apache'
ONLINE_EDITOR__devDeploymentDmnFormWebappImageName =
'incubator-kie-sandbox-dev-deployment-dmn-form-webapp'
ONLINE_EDITOR__devDeploymentDmnFormWebappImageTag =
"${params.BRANCH_NAME}"
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry =
'docker.io'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount =
'apache'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag =
"${params.BRANCH_NAME}"
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageRegistry = 'docker.io'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageAccount = 'apache'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageTag =
"${params.BRANCH_NAME}"
ONLINE_EDITOR__corsProxyUrl =
'https://daily-dev-cors-proxy-kie-sandbox.rhba-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud'
EXTENDED_SERVICES__kieSandboxUrl =
'https://apache.github.io/incubator-kie-kogito-online/dev'
@@ -347,14 +347,14 @@ pipeline {
}
}
- stage('Push dev-deployment-kogito-quarkus-blank-app-image to Docker
Hub') {
+ stage('Push dev-deployment-quarkus-blank-app-image to Docker Hub') {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account}",
+ "${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
"${pipelineVars.dockerHubTokenCredentialsId}"
)
diff --git a/.ci/jenkins/Jenkinsfile.release-build
b/.ci/jenkins/Jenkinsfile.release-build
index 187d125e97b..f08026b95a9 100644
--- a/.ci/jenkins/Jenkinsfile.release-build
+++ b/.ci/jenkins/Jenkinsfile.release-build
@@ -98,13 +98,13 @@ pipeline {
}
}
- stage('Dev Deployment Kogito Quarkus Blank App Image') {
+ stage('Dev Deployment Quarkus Blank App Image') {
when {
- expression {
env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE == 'true' }
+ expression {
env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE == 'true' }
}
steps {
script {
- devDeploymentKogitoQuarkusBlankAppImageBuildJob()
+ devDeploymentQuarkusBlankAppImageBuildJob()
}
}
}
@@ -428,7 +428,7 @@ def setRunners() {
runners = readJSON text: "${params.RUNNERS}"
env.KIE_SANDBOX_ACCELERATOR_QUARKUS =
runners.kie_sandbox_accelerator_quarkus
env.DEV_DEPLOYMENT_BASE_IMAGE = runners.dev_deployment_base_image
- env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE =
runners.dev_deployment_kogito_quakus_blank_app_image
+ env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE =
runners.dev_deployment_kogito_quakus_blank_app_image
env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE =
runners.dev_deployment_dmn_form_webapp_image
env.DEV_DEPLOYMENT_UPLOAD_SERVICE = runners.dev_deployment_upload_service
env.KIE_SANDBOX_IMAGE = runners.kie_sandbox_image
@@ -461,7 +461,7 @@ def printRunners() {
sh """
echo "kie_sandbox_accelerator_quarkus:
${env.KIE_SANDBOX_ACCELERATOR_QUARKUS}"
echo "dev_deployment_base_image: ${env.DEV_DEPLOYMENT_BASE_IMAGE}"
- echo "dev_deployment_kogito_quakus_blank_app_image:
${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE}"
+ echo "dev_deployment_kogito_quakus_blank_app_image:
${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE}"
echo "dev_deployment_dmn_form_webapp_image:
${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE}"
echo "dev_deployment_upload_service: ${env.DEV_DEPLOYMENT_UPLOAD_SERVICE}"
echo "kie_sandbox_image: ${env.KIE_SANDBOX_IMAGE}"
@@ -491,9 +491,9 @@ def printRunners() {
""".trim()
}
-def devDeploymentKogitoQuarkusBlankAppImageBuildJob() {
- env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_JOB_RESULT = build(
- job:
'KIE/kie-tools/kie-tools-release-jobs/dev-deployment-kogito-quarkus-blank-app-image',
+def devDeploymentQuarkusBlankAppImageBuildJob() {
+ env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_JOB_RESULT = build(
+ job:
'KIE/kie-tools/kie-tools-release-jobs/dev-deployment-quarkus-blank-app-image',
parameters: [
booleanParam(name: 'DRY_RUN', value: "${params.DRY_RUN}"),
string(name: 'BASE_REF', value: "${params.BASE_REF}"),
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-quarkus-blank-app-image
similarity index 85%
rename from
.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
rename to
.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-quarkus-blank-app-image
index 5deed41f18f..cdfa3b39522 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-quarkus-blank-app-image
@@ -39,16 +39,16 @@ pipeline {
KIE_TOOLS_BUILD__runEndToEndTests = 'false'
KIE_TOOLS_BUILD__buildContainerImages = 'true'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag = "latest
${params.RELEASE_VERSION}"
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag = "latest
${params.RELEASE_VERSION}"
RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
DOCKER_CONFIG = "${WORKSPACE}/.docker"
- PNPM_FILTER_STRING = '-F
@kie-tools/dev-deployment-kogito-quarkus-blank-app-image...'
+ PNPM_FILTER_STRING = '-F
@kie-tools/dev-deployment-quarkus-blank-app-image...'
}
stages {
@@ -136,17 +136,17 @@ pipeline {
}
}
- stage('Push dev-deployment-kogito-quarkus-blank-app-image to Docker
Hub') {
+ stage('Push dev-deployment-quarkus-blank-app-image to Docker Hub') {
when {
expression { !params.DRY_RUN &&
params.RELEASE_CANDIDATE_VERSION == '' }
}
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account}",
+ "${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name}",
+
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
"${pipelineVars.dockerHubTokenCredentialsId}"
)
@@ -164,7 +164,7 @@ pipeline {
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- docker save
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
+ docker save
"${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account}/${env.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
""".trim()
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
index 357a97372a3..c943634073c 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
@@ -52,10 +52,10 @@ pipeline {
ONLINE_EDITOR__devDeploymentDmnFormWebappImageAccount = 'apache'
ONLINE_EDITOR__devDeploymentDmnFormWebappImageName =
'incubator-kie-sandbox-dev-deployment-dmn-form-webapp'
ONLINE_EDITOR__devDeploymentDmnFormWebappImageTag =
"${params.RELEASE_VERSION}"
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry =
'docker.io'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount =
'apache'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag =
"${params.RELEASE_VERSION}"
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageRegistry = 'docker.io'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageAccount = 'apache'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageTag =
"${params.RELEASE_VERSION}"
ONLINE_EDITOR__corsProxyUrl =
'https://cors-proxy-kie-sandbox.rhba-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud'
RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
diff --git a/.rat-excludes b/.rat-excludes
index a9375ff9e57..2ebabc07448 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -288,8 +288,8 @@ salesYear2014.dset
salesPerYear.dset
#
packages/dashbuilder-language-service/tests/__snapshots__/DashbuilderYamlLanguageService.test.ts.snap
DashbuilderYamlLanguageService.test.ts.snap
-#
packages/dev-deployment-kogito-quarkus-blank-app/dev-deployment-kogito-quarkus-blank-app.iml
-dev-deployment-kogito-quarkus-blank-app.iml
+#
packages/dev-deployment-quarkus-blank-app/dev-deployment-quarkus-blank-app.iml
+dev-deployment-quarkus-blank-app.iml
# packages/dev-deployment-upload-service/go.mod
go.mod
# packages/dev-deployment-upload-service/go.sum
diff --git a/_intellij-project/.idea/misc.xml b/_intellij-project/.idea/misc.xml
index 7259582a19a..26b40eedc84 100644
--- a/_intellij-project/.idea/misc.xml
+++ b/_intellij-project/.idea/misc.xml
@@ -13,7 +13,7 @@
<option
value="$PROJECT_DIR$/../packages/sonataflow-quarkus-devui/pom.xml" />
<option
value="$PROJECT_DIR$/../packages/serverless-workflow-diagram-editor/pom.xml" />
<option
value="$PROJECT_DIR$/../packages/extended-services-java/pom.xml" />
- <option
value="$PROJECT_DIR$/../packages/dev-deployment-kogito-quarkus-blank-app/pom.xml"
/>
+ <option
value="$PROJECT_DIR$/../packages/dev-deployment-quarkus-blank-app/pom.xml" />
<option
value="$PROJECT_DIR$/../examples/process-user-tasks-subsystem/pom.xml" />
<option value="$PROJECT_DIR$/../examples/sonataflow-greeting/pom.xml"
/>
<option value="$PROJECT_DIR$/../packages/dashbuilder/pom.xml" />
diff --git a/_intellij-project/.idea/modules.xml
b/_intellij-project/.idea/modules.xml
index f341020366e..4e611c62aa1 100644
--- a/_intellij-project/.idea/modules.xml
+++ b/_intellij-project/.idea/modules.xml
@@ -3,7 +3,7 @@
<component name="ProjectModuleManager">
<modules>
<module
fileurl="file://$PROJECT_DIR$/../packages/dashbuilder/dashbuilder-parent.iml"
filepath="$PROJECT_DIR$/../packages/dashbuilder/dashbuilder-parent.iml" />
- <module
fileurl="file://$PROJECT_DIR$/../packages/dev-deployment-kogito-quarkus-blank-app/dev-deployment-kogito-quarkus-blank-app.iml"
filepath="$PROJECT_DIR$/../packages/dev-deployment-kogito-quarkus-blank-app/dev-deployment-kogito-quarkus-blank-app.iml"
/>
+ <module
fileurl="file://$PROJECT_DIR$/../packages/dev-deployment-quarkus-blank-app/dev-deployment-quarkus-blank-app.iml"
filepath="$PROJECT_DIR$/../packages/dev-deployment-quarkus-blank-app/dev-deployment-quarkus-blank-app.iml"
/>
<module
fileurl="file://$PROJECT_DIR$/../packages/dmn-marshaller-backend-compatibility-tester/dmn-marshaller-backend-compatibility-tester.iml"
filepath="$PROJECT_DIR$/../packages/dmn-marshaller-backend-compatibility-tester/dmn-marshaller-backend-compatibility-tester.iml"
/>
<module
fileurl="file://$PROJECT_DIR$/../packages/dmn-testing-models/dmn-testing-models.iml"
filepath="$PROJECT_DIR$/../packages/dmn-testing-models/dmn-testing-models.iml"
/>
<module
fileurl="file://$PROJECT_DIR$/../packages/extended-services-java/extended-services-java.iml"
filepath="$PROJECT_DIR$/../packages/extended-services-java/extended-services-java.iml"
/>
diff --git a/packages/dev-deployment-dmn-form-webapp-image/README.md
b/packages/dev-deployment-dmn-form-webapp-image/README.md
index e1d1efb3e31..b643bea8994 100644
--- a/packages/dev-deployment-dmn-form-webapp-image/README.md
+++ b/packages/dev-deployment-dmn-form-webapp-image/README.md
@@ -40,12 +40,12 @@ docker run -p 8081:8081
docker.io/apache/incubator-kie-sandbox-dev-deployment-dm
To develop this webapp you can start the webapp container and a quarkus app
container to be used as backend:
```bash
-docker run -d -p 8080:8080 -e DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY=dev
docker.io/apache/incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app:main
+docker run -d -p 8080:8080 -e DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY=dev
docker.io/apache/incubator-kie-sandbox-dev-deployment-quarkus-blank-app:main
docker run -d -p 8081:8081 -e
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_QUARKUS_APP_ORIGIN=http://localhost:8080
docker.io/apache/incubator-kie-sandbox-dev-deployment-dmn-form-webapp:main
```
-The Quarkus app will be running on port 8080 and you will have to upload some
DMNs to it (check the [dev-deployment-kogito-quarkus-blank-app-image
README](../dev-deployment-kogito-quarkus-blank-app-image/README.md));
+The Quarkus app will be running on port 8080 and you will have to upload some
DMNs to it (check the [dev-deployment-quarkus-blank-app-image
README](../dev-deployment-quarkus-blank-app-image/README.md));
The DMN Form Webapp will be running on port 8081 and will be using the Quarkus
app on port 8080 as it's backend.
diff --git a/packages/dev-deployment-dmn-form-webapp/README.md
b/packages/dev-deployment-dmn-form-webapp/README.md
index bc2a63de395..61a74ec1c14 100644
--- a/packages/dev-deployment-dmn-form-webapp/README.md
+++ b/packages/dev-deployment-dmn-form-webapp/README.md
@@ -17,7 +17,7 @@
# KIE Sandbox Dev Deployment DMN Form Webapp Image
-Form Webapp to fill and submit decisions inputs. Requires a kogito quarkus app
as it's backend.
+Form Webapp to fill and submit decisions inputs. Requires a Quarkus Kogito app
as it's backend.
## Environment Variables
diff --git
a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
b/packages/dev-deployment-quarkus-blank-app-image/Containerfile
similarity index 100%
rename from packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
rename to packages/dev-deployment-quarkus-blank-app-image/Containerfile
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md
b/packages/dev-deployment-quarkus-blank-app-image/README.md
similarity index 95%
rename from packages/dev-deployment-kogito-quarkus-blank-app-image/README.md
rename to packages/dev-deployment-quarkus-blank-app-image/README.md
index a72f1849c5e..d3266d2fdfe 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md
+++ b/packages/dev-deployment-quarkus-blank-app-image/README.md
@@ -15,10 +15,10 @@
under the License.
-->
-# Dev Deployment Kogito Quarkus Blank App Image
+# Dev Deployment Quarkus Blank App Image
This image is ready to be used for Dev Deployments on KIE Sandbox.
-It starts the dev-deployment-upload-service and then places the uploaded files
inside a blank Kogito Quarkus app.
+It starts the dev-deployment-upload-service and then places the uploaded files
inside a blank Quarkus Kogito app.
These files can decisions or processes, all of them will be used as resources
for the app.
## Build arguments
@@ -45,7 +45,7 @@ These files can decisions or processes, all of them will be
used as resources fo
Run the image with:
-- `docker run -p 8080:8080 -e DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY=dev
docker.io/apache/incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app:main`
+- `docker run -p 8080:8080 -e DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY=dev
docker.io/apache/incubator-kie-sandbox-dev-deployment-quarkus-blank-app:main`
Then upload a zip file containing the resources (DMN, BPMN, etc)
diff --git
a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
b/packages/dev-deployment-quarkus-blank-app-image/env/index.js
similarity index 70%
rename from packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
rename to packages/dev-deployment-quarkus-blank-app-image/env/index.js
index 62353539324..d70e97906e9 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
+++ b/packages/dev-deployment-quarkus-blank-app-image/env/index.js
@@ -31,35 +31,35 @@ const {
module.exports = composeEnv([rootEnv], {
vars: varsWithName({
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__builderImage: {
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__builderImage: {
default:
`${devDeploymentBaseImageEnv.registry}/${devDeploymentBaseImageEnv.account}/${devDeploymentBaseImageEnv.name}:${devDeploymentBaseImageEnv.buildTag}`,
description: "The image used in the FROM import.",
},
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry: {
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry: {
default: "docker.io",
description: "E.g., `docker.io` or `quay.io`.",
},
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account: {
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account: {
default: "apache",
description: "E.g,. `apache` or `kie-tools-bot`",
},
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name: {
- default: "incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app",
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name: {
+ default: "incubator-kie-sandbox-dev-deployment-quarkus-blank-app",
description: "Name of the image itself.",
},
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag: {
+ DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag: {
default: rootEnv.env.root.streamName,
description: "Tag version of this image. E.g., `main` or `10.0.x` or
`10.0.0",
},
}),
get env() {
return {
- devDeploymentKogitoQuarkusBlankAppImage: {
- builderImage:
getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__builderImage),
- registry:
getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry),
- account:
getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account),
- name:
getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name),
- buildTag:
getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag),
+ devDeploymentQuarkusBlankAppImage: {
+ builderImage:
getOrDefault(this.vars.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__builderImage),
+ registry:
getOrDefault(this.vars.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__registry),
+ account:
getOrDefault(this.vars.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__account),
+ name:
getOrDefault(this.vars.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__name),
+ buildTag:
getOrDefault(this.vars.DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE__buildTag),
version: require("../package.json").version,
dev: {
mavenM2RepoViaHttpImage:
`${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
diff --git
a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
b/packages/dev-deployment-quarkus-blank-app-image/package.json
similarity index 56%
rename from packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
rename to packages/dev-deployment-quarkus-blank-app-image/package.json
index 6f532c21034..a484da4d2dd 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
+++ b/packages/dev-deployment-quarkus-blank-app-image/package.json
@@ -1,6 +1,6 @@
{
"private": true,
- "name": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image",
+ "name": "@kie-tools/dev-deployment-quarkus-blank-app-image",
"version": "0.0.0",
"description": "",
"license": "Apache-2.0",
@@ -21,21 +21,21 @@
"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')\"",
- "create-test-image:build-only": "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)\"",
- "create-test-image:kind": "kie-tools--image-builder kind -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)\" --kind-cluster-name
kie-sandbox-dev-cluster",
- "create-test-image:minikube": "kie-tools--image-builder minikube -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)\"",
- "create-test-image:openshift": "kie-tools--image-builder openshift -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)\"",
- "image:docker: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)\"",
+ "copy:quarkus-app:linux:darwin": " cp -R
./node_modules/@kie-tools/dev-deployment-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-quarkus-blank-app/*
./dist-dev/quarkus-app -Exclude @('node_modules')\"",
+ "create-test-image:build-only": "kie-tools--image-builder build
--allowHostNetworkAccess -r \"$(build-env
devDeploymentQuarkusBlankAppImage.registry)\" -a \"$(build-env
devDeploymentQuarkusBlankAppImage.account)\" -n \"$(build-env
devDeploymentQuarkusBlankAppImage.name)\" -t \"$(build-env
devDeploymentQuarkusBlankAppImage.buildTag)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env
devDeploymentQuarkusBlankAppImage.builderImage)\"",
+ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env
devDeploymentQuarkusBlankAppImage.registry)\" -a \"$(build-env
devDeploymentQuarkusBlankAppImage.account)\" -n \"$(build-env
devDeploymentQuarkusBlankAppImage.name)\" -t \"$(build-env
devDeploymentQuarkusBlankAppImage.buildTag)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env
devDeploymentQuarkusBlankAppImage.builderImage)\" --kind-cluster-name
kie-sandbox-dev-cluster",
+ "create-test-image:minikube": "kie-tools--image-builder minikube -r
\"$(build-env devDeploymentQuarkusBlankAppImage.registry)\" -a \"$(build-env
devDeploymentQuarkusBlankAppImage.account)\" -n \"$(build-env
devDeploymentQuarkusBlankAppImage.name)\" -t \"$(build-env
devDeploymentQuarkusBlankAppImage.buildTag)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env
devDeploymentQuarkusBlankAppImage.builderImage)\"",
+ "create-test-image:openshift": "kie-tools--image-builder openshift -r
\"$(build-env devDeploymentQuarkusBlankAppImage.registry)\" -a \"$(build-env
devDeploymentQuarkusBlankAppImage.account)\" -n \"$(build-env
devDeploymentQuarkusBlankAppImage.name)\" -t \"$(build-env
devDeploymentQuarkusBlankAppImage.buildTag)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env
devDeploymentQuarkusBlankAppImage.builderImage)\"",
+ "image:docker:build": "kie-tools--image-builder build
--allowHostNetworkAccess -r \"$(build-env
devDeploymentQuarkusBlankAppImage.registry)\" -a \"$(build-env
devDeploymentQuarkusBlankAppImage.account)\" -n \"$(build-env
devDeploymentQuarkusBlankAppImage.name)\" -t \"$(build-env
devDeploymentQuarkusBlankAppImage.buildTag)\" --build-arg
BUILDER_IMAGE_ARG=\"$(build-env
devDeploymentQuarkusBlankAppImage.builderImage)\"",
"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/tmp-m2/repository`,
`./node_modules/@kie-tools/dev-deployment-kogito-quarkus-blank-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 -p 8888:80 --name m2-repo-via-http -v
\"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env
devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)",
+ "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e
'require(`@kie-tools/maven-base`).prepareHardLinkedM2ForPackage(`./dist/tmp-m2/repository`,
`./node_modules/@kie-tools/dev-deployment-quarkus-blank-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 -p 8888:80 --name m2-repo-via-http -v
\"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env
devDeploymentQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command"
},
"dependencies": {
"@kie-tools/dev-deployment-base-image": "workspace:*",
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app": "workspace:*"
+ "@kie-tools/dev-deployment-quarkus-blank-app": "workspace:*"
},
"devDependencies": {
"@kie-tools/image-builder": "workspace:*",
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/README.md
b/packages/dev-deployment-quarkus-blank-app/README.md
similarity index 92%
rename from packages/dev-deployment-kogito-quarkus-blank-app/README.md
rename to packages/dev-deployment-quarkus-blank-app/README.md
index 950cdaad16d..30425c18d8d 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app/README.md
+++ b/packages/dev-deployment-quarkus-blank-app/README.md
@@ -15,7 +15,9 @@
under the License.
-->
-## @kie-tools/dev-deployment-kogito-quarkus-blank-app
+## @kie-tools/dev-deployment-quarkus-blank-app
+
+A blank Quarkus-based application capable of running BPMN and DMN models when
put inside `src/main/resources` directory.
---
diff --git
a/packages/dev-deployment-kogito-quarkus-blank-app/dev-deployment-kogito-quarkus-blank-app.iml
b/packages/dev-deployment-quarkus-blank-app/dev-deployment-quarkus-blank-app.iml
similarity index 100%
rename from
packages/dev-deployment-kogito-quarkus-blank-app/dev-deployment-kogito-quarkus-blank-app.iml
rename to
packages/dev-deployment-quarkus-blank-app/dev-deployment-quarkus-blank-app.iml
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/env/index.js
b/packages/dev-deployment-quarkus-blank-app/env/index.js
similarity index 100%
rename from packages/dev-deployment-kogito-quarkus-blank-app/env/index.js
rename to packages/dev-deployment-quarkus-blank-app/env/index.js
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/install.js
b/packages/dev-deployment-quarkus-blank-app/install.js
similarity index 100%
rename from packages/dev-deployment-kogito-quarkus-blank-app/install.js
rename to packages/dev-deployment-quarkus-blank-app/install.js
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/package.json
b/packages/dev-deployment-quarkus-blank-app/package.json
similarity index 96%
rename from packages/dev-deployment-kogito-quarkus-blank-app/package.json
rename to packages/dev-deployment-quarkus-blank-app/package.json
index 2435014a4d3..4f50663ffb6 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app/package.json
+++ b/packages/dev-deployment-quarkus-blank-app/package.json
@@ -1,6 +1,6 @@
{
"private": true,
- "name": "@kie-tools/dev-deployment-kogito-quarkus-blank-app",
+ "name": "@kie-tools/dev-deployment-quarkus-blank-app",
"version": "0.0.0",
"description": "",
"license": "Apache-2.0",
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml
b/packages/dev-deployment-quarkus-blank-app/pom.xml
similarity index 98%
rename from packages/dev-deployment-kogito-quarkus-blank-app/pom.xml
rename to packages/dev-deployment-quarkus-blank-app/pom.xml
index 735294957aa..0558c6650e4 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml
+++ b/packages/dev-deployment-quarkus-blank-app/pom.xml
@@ -30,10 +30,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.kie.kogito</groupId>
- <artifactId>dev-deployment-kogito-quarkus-blank-app</artifactId>
+ <artifactId>dev-deployment-quarkus-blank-app</artifactId>
<version>${revision}</version>
- <name>KIE Tools :: KIE Sandbox :: Dev deployment Kogito Quarkus blank
app</name>
+ <name>KIE Tools :: KIE Sandbox :: Dev deployment Quarkus blank app</name>
<properties>
<maven.compiler.source>17</maven.compiler.source>
diff --git
a/packages/dev-deployment-kogito-quarkus-blank-app/src/main/resources/application.properties
b/packages/dev-deployment-quarkus-blank-app/src/main/resources/application.properties
similarity index 100%
rename from
packages/dev-deployment-kogito-quarkus-blank-app/src/main/resources/application.properties
rename to
packages/dev-deployment-quarkus-blank-app/src/main/resources/application.properties
diff --git a/packages/kie-sandbox-webapp-image/README.md
b/packages/kie-sandbox-webapp-image/README.md
index 1f60cc363c3..ac9ba707591 100644
--- a/packages/kie-sandbox-webapp-image/README.md
+++ b/packages/kie-sandbox-webapp-image/README.md
@@ -71,20 +71,20 @@ This package contains the `Containerfile/Dockerfile` and
scripts to build a cont
[comment]: <> (//TODO: Use EnvJson.schema.json to generate this
documentation somehow.. See
https://github.com/apache/incubator-kie-issues/issues/16)
- | Name |
Description
| Default
|
- | :-------------------------------------------------------------: |
:-------------------------------------------------------------------------------------------------------------------------:
| :-----------------------------------------------------------------: |
- | `KIE_SANDBOX_EXTENDED_SERVICES_URL` |
The URL that points to the Extended Services.
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_CORS_PROXY_URL` |
The URL that points to the CORS proxy for interacting with
external services. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL` |
The URL that points to the Base image that is used on Dev
Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL` |
The URL that points to the Kogito Quarkus Blank App image that is used
on Dev Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL` |
The URL that points to form webapp image that is used on Dev
Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_DEV_DEPLOYMENT_IMAGE_PULL_POLICY` |
The image pull policy for Dev Deployments
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_REQUIRE_CUSTOM_COMMIT_MESSAGE` |
Require users to type a custom commit message when creating a
new commit. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_CUSTOM_COMMIT_MESSAGES_VALIDATION_SERVICE_URL` |
Service URL to validate commit messages.
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_AUTH_PROVIDERS` |
Authentication providers configuration. Used to enable integration with GitHub
Enterprise Server instances and more. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_ACCELERATORS` |
Accelerators configuration. Used to add a template to a set of Decisions and
Workflows, making it buildable and deployable. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_EDITORS` |
Editors configuration. Used to enable/disable specific
editors. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
- | `KIE_SANDBOX_APP_NAME` |
Allows KIE Sandbox to be referred by a different
name. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | Name |
Description
| Default
|
+ | :---------------------------------------------------------: |
:-------------------------------------------------------------------------------------------------------------------------:
| :-----------------------------------------------------------------: |
+ | `KIE_SANDBOX_EXTENDED_SERVICES_URL` |
The URL that points to the Extended Services.
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_CORS_PROXY_URL` |
The URL that points to the CORS proxy for interacting with external
services. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL` |
The URL that points to the Base image that is used on Dev
Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL` |
The URL that points to the Quarkus Blank App image that is used on Dev
Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL` |
The URL that points to form webapp image that is used on Dev
Deployments. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_DEV_DEPLOYMENT_IMAGE_PULL_POLICY` |
The image pull policy for Dev Deployments
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_REQUIRE_CUSTOM_COMMIT_MESSAGE` |
Require users to type a custom commit message when creating a new
commit. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_CUSTOM_COMMIT_MESSAGES_VALIDATION_SERVICE_URL` |
Service URL to validate commit messages.
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_AUTH_PROVIDERS` |
Authentication providers configuration. Used to enable integration with GitHub
Enterprise Server instances and more. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_ACCELERATORS` |
Accelerators configuration. Used to add a template to a set of Decisions and
Workflows, making it buildable and deployable. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_EDITORS` |
Editors configuration. Used to enable/disable specific
editors. | See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
+ | `KIE_SANDBOX_APP_NAME` |
Allows KIE Sandbox to be referred by a different name.
| See [ defaultEnvJson.ts
](../online-editor/build/defaultEnvJson.ts) |
### Examples
@@ -166,7 +166,7 @@ This package contains the `Containerfile/Dockerfile` and
scripts to build a cont
ENV KIE_SANDBOX_EXTENDED_SERVICES_URL=<my_value>
ENV KIE_SANDBOX_CORS_PROXY_URL=<my_value>
ENV KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL=<my_value>
- ENV KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL=<my_value>
+ ENV KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL=<my_value>
ENV KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL=<my_value>
ENV KIE_SANDBOX_DEV_DEPLOYMENT_IMAGE_PULL_POLICY=<my_value>
ENV KIE_SANDBOX_REQUIRE_CUSTOM_COMMIT_MESSAGE=<my_value>
@@ -358,7 +358,7 @@ KIE Sandbox allows for the images used on DMN Dev
Deployments to be customized.
```docker
ENV
KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL="docker.io/apache/incubator-kie-sandbox0dev-deployment-base:latest"
-ENV
KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL="docker.io/apache/incubator-kie-sandbox0dev-deployment-kogito-quarkus-blank-app:latest"
+ENV
KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL="docker.io/apache/incubator-kie-sandbox0dev-deployment-quarkus-blank-app:latest"
ENV
KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL="docker.io/apache/incubator-kie-sandbox0dev-deployment-dmn-form-webapp:latest"
```
diff --git a/packages/online-editor/build/defaultEnvJson.ts
b/packages/online-editor/build/defaultEnvJson.ts
index ea5c756130f..46bd281196c 100644
--- a/packages/online-editor/build/defaultEnvJson.ts
+++ b/packages/online-editor/build/defaultEnvJson.ts
@@ -46,8 +46,8 @@ export const defaultEnvJson: EnvJson = {
KIE_SANDBOX_EXTENDED_SERVICES_URL: buildEnv.onlineEditor.extendedServicesUrl,
KIE_SANDBOX_DISABLE_EXTENDED_SERVICES_WIZARD:
buildEnv.onlineEditor.disableExtendedServicesWizard,
KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL:
getDevDeploymentImageUrl(buildEnv.devDeployments.baseImage),
- KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL:
getDevDeploymentImageUrl(
- buildEnv.devDeployments.kogitoQuarkusBlankAppImage
+ KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL:
getDevDeploymentImageUrl(
+ buildEnv.devDeployments.quarkusBlankAppImage
),
KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL:
getDevDeploymentImageUrl(
buildEnv.devDeployments.dmnFormWebappImage
diff --git a/packages/online-editor/docs/DEV_DEPLOYMENTS_ARCHITECTURE.md
b/packages/online-editor/docs/DEV_DEPLOYMENTS_ARCHITECTURE.md
index 8923e0b6c7e..97dc4dd98ed 100644
--- a/packages/online-editor/docs/DEV_DEPLOYMENTS_ARCHITECTURE.md
+++ b/packages/online-editor/docs/DEV_DEPLOYMENTS_ARCHITECTURE.md
@@ -189,7 +189,7 @@ ENTRYPOINT ["/bin/bash", "-c"]
# The CMD directive is not necessary since KIE Sandbox will overwrite it.
```
-As an example of a template Quarkus app, checkout
[dev-deployment-kogito-quarkus-blank-app](../../dev-deployment-kogito-quarkus-blank-app).
+As an example of a template Quarkus app, checkout
[dev-deployment-quarkus-blank-app](../../dev-deployment-quarkus-blank-app).
Now all you have to do is build and publish your image.
@@ -236,7 +236,7 @@ When creating a Dev Deployment on KIE Tools you'll be met
with this modal:
-By default, it's going to use the pre-configured `Kogito Quarkus Blank App`
option, but we want to use our custom image, so we need to open the dropdown
and select `Custom Image`.
+By default, it's going to use the pre-configured `Quarkus Blank App` option,
but we want to use our custom image, so we need to open the dropdown and select
`Custom Image`.
@@ -263,7 +263,7 @@ Before any deployment is made when adding a new Kubernetes
or OpenShift cluster
When you click on "Deploy" a lot has to happen behind the scenes so that your
Dev Deployment happens. Here's a basic step-by-step:
1. KIE Sandbox will zip all the files in the workspace being deployed
(ignoring .git directories);
-2. Then it will load the chosen deployment option (Custom Image or Kogito
Quarkus Blank app) YAML files and modify them dynamically:
+2. Then it will load the chosen deployment option (Custom Image or Quarkus
Blank app) YAML files and modify them dynamically:
- Applying the required patches to set KIE Sandbox labels, annotations, and
resource names;
- Applying patches related to the parameters set in the deployment modal
(each parameter corresponds to a set of patches and tokens);
- Interpolate all tokens with their corresponding values, including
parameters;
@@ -277,6 +277,6 @@ When you click on "Deploy" a lot has to happen behind the
scenes so that your De
6. The Dev Deployment Upload Service receives the .zip file and extracts it to
the defined path (this path is set using the configured environment variables
on the container). After the extraction is over, the service ends with a status
code 0 and calls the next defined command (usually `mvn quarkus:dev` or
whatever is defined in the Custom Image option parameter);
7. A quarkus application starts loading inside the container, while KIE
Sandbox starts polling the container to check if the quarkus app is ready;
8. When quarkus finishes loading and the polling succeeds, KIE Sandbox updates
the Dev Deployment icon to a success icon and provides a link to the Dev
Deployment endpoint, which can be either:
- - The Quarkus swagger-ui if deployed via Custom Image or Kogito Quarkus
Blank App options, without the DMN Form Webapp parameter;
+ - The Quarkus swagger-ui if deployed via Custom Image or Quarkus Blank App
options, without the DMN Form Webapp parameter;
- The DMN Form Webapp if the checkbox for it was checked;
9. Users can interact with the Dev Deployment and test/validate their
decisions and processes, after that's finished it's possible to delete a
deployment by hovering over it in the Dev Deployments list and clicking on the
trash icon.
diff --git a/packages/online-editor/env/index.js
b/packages/online-editor/env/index.js
index abeda781a58..d8045184999 100644
--- a/packages/online-editor/env/index.js
+++ b/packages/online-editor/env/index.js
@@ -92,19 +92,19 @@ module.exports = composeEnv([rootEnv,
extendedServicesJavaEnv, corsProxyEnv, kie
default: rootEnv.env.root.streamName,
description: "Image tag to be used by Dev Deployments when deploying
models.",
},
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry: {
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageRegistry: {
default: "docker.io",
description: "Image registry to be used by Dev Deployments when
deploying models.",
},
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount: {
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageAccount: {
default: "apache",
description: "Image account to be used by Dev Deployments when deploying
models.",
},
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName: {
- default: "incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app",
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageName: {
+ default: "incubator-kie-sandbox-dev-deployment-quarkus-blank-app",
description: "Image name to be used by Dev Deployments when deploying
models.",
},
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag: {
+ ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageTag: {
default: rootEnv.env.root.streamName,
description: "Image tag to be used by Dev Deployments when deploying
models.",
},
@@ -192,11 +192,11 @@ module.exports = composeEnv([rootEnv,
extendedServicesJavaEnv, corsProxyEnv, kie
account:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentBaseImageAccount),
name:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentBaseImageName),
},
- kogitoQuarkusBlankAppImage: {
- tag:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag),
- registry:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry),
- account:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount),
- name:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName),
+ quarkusBlankAppImage: {
+ tag:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageTag),
+ registry:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageRegistry),
+ account:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageAccount),
+ name:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentQuarkusBlankAppImageName),
},
dmnFormWebappImage: {
tag:
getOrDefault(this.vars.ONLINE_EDITOR__devDeploymentDmnFormWebappImageTag),
diff --git a/packages/online-editor/src/aboutModal/AboutButton.tsx
b/packages/online-editor/src/aboutModal/AboutButton.tsx
index d4ea6cc3d93..6fedf9840c3 100644
--- a/packages/online-editor/src/aboutModal/AboutButton.tsx
+++ b/packages/online-editor/src/aboutModal/AboutButton.tsx
@@ -43,7 +43,7 @@ export const AboutButton: React.FunctionComponent = () => {
const kogitoRuntimesVersion =
process.env.WEBPACK_REPLACE__kogitoRuntimeVersion;
const quarkusVersion = process.env.WEBPACK_REPLACE__quarkusPlatformVersion;
const devDeploymentsBaseImageUrl =
env.KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL;
- const devDeploymentsKogitoQuarkusBlankAppImageUrl =
env.KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL;
+ const devDeploymentsQuarkusBlankAppImageUrl =
env.KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL;
const devDeploymentsDmnFormWebappImageUrl =
env.KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL;
const extendedServicesVersion =
process.env.WEBPACK_REPLACE__extendedServicesCompatibleVersion;
const commitSha = process.env.WEBPACK_REPLACE__commitHash;
@@ -101,8 +101,8 @@ export const AboutButton: React.FunctionComponent = () => {
<DescriptionListDescription>{devDeploymentsBaseImageUrl}</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
- <DescriptionListTerm>Dev Deployments Kogito Quarkus Blank App
image URL: </DescriptionListTerm>
-
<DescriptionListDescription>{devDeploymentsKogitoQuarkusBlankAppImageUrl}</DescriptionListDescription>
+ <DescriptionListTerm>Dev Deployments Quarkus Blank App image
URL: </DescriptionListTerm>
+
<DescriptionListDescription>{devDeploymentsQuarkusBlankAppImageUrl}</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
<DescriptionListTerm>Dev Deployments DMN Form webapp image URL:
</DescriptionListTerm>
diff --git
a/packages/online-editor/src/devDeployments/DevDeploymentsConfirmDeployModal.tsx
b/packages/online-editor/src/devDeployments/DevDeploymentsConfirmDeployModal.tsx
index 018d9c8f0d7..33984a3c0b4 100644
---
a/packages/online-editor/src/devDeployments/DevDeploymentsConfirmDeployModal.tsx
+++
b/packages/online-editor/src/devDeployments/DevDeploymentsConfirmDeployModal.tsx
@@ -58,7 +58,7 @@ export function DevDeploymentsConfirmDeployModal(props:
Props) {
const deploymentOptionsArgs: DeploymentOptionArgs = useMemo(
() => ({
- kogitoQuarkusBlankAppImageUrl:
env.KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL,
+ quarkusBlankAppImageUrl:
env.KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL,
baseImageUrl: env.KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL,
dmnFormWebappImageUrl:
env.KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL,
imagePullPolicy: env.KIE_SANDBOX_DEV_DEPLOYMENT_IMAGE_PULL_POLICY,
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/customImage/DeploymentYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/customImage/DeploymentYaml.ts
index 74ffc21d742..5efbbd35e55 100644
---
a/packages/online-editor/src/devDeployments/services/deploymentOptions/customImage/DeploymentYaml.ts
+++
b/packages/online-editor/src/devDeployments/services/deploymentOptions/customImage/DeploymentYaml.ts
@@ -45,7 +45,7 @@ spec:
spec:
containers:
- name: \${{ devDeployment.uniqueName }}
- image: ${args.kogitoQuarkusBlankAppImageUrl}
+ image: ${args.quarkusBlankAppImageUrl}
imagePullPolicy: ${args.imagePullPolicy}
resources:
limits:
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/DeploymentYaml.ts
similarity index 97%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/DeploymentYaml.ts
index 709f11046a0..aeb1d2414a4 100644
---
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts
+++
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/DeploymentYaml.ts
@@ -48,7 +48,7 @@ spec:
emptyDir: {}
containers:
- name: \${{ devDeployment.uniqueName }}
- image: ${args.kogitoQuarkusBlankAppImageUrl}
+ image: ${args.quarkusBlankAppImageUrl}
imagePullPolicy: ${args.imagePullPolicy}
resources:
limits:
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappIngressYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappIngressYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappIngressYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappIngressYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappRouteYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappRouteYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappRouteYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappRouteYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappServiceYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappServiceYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/FormWebappServiceYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/FormWebappServiceYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/IngressYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/IngressYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/IngressYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/IngressYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/RouteYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/RouteYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/RouteYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/RouteYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/ServiceYaml.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/ServiceYaml.ts
similarity index 100%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/ServiceYaml.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/ServiceYaml.ts
diff --git
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/index.ts
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/index.ts
similarity index 87%
rename from
packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/index.ts
rename to
packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/index.ts
index d1907a5614a..8300d198eac 100644
---
a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/index.ts
+++
b/packages/online-editor/src/devDeployments/services/deploymentOptions/quarkusBlankApp/index.ts
@@ -22,9 +22,9 @@ import { DeploymentOption, DeploymentOptionOpts } from
"../types";
import { DeploymentYaml } from "./DeploymentYaml";
import { ServiceYaml } from "./ServiceYaml";
-export function KogitoQuarkusBlankAppOption(args: DeploymentOptionArgs, opts?:
DeploymentOptionOpts): DeploymentOption {
+export function QuarkusBlankAppOption(args: DeploymentOptionArgs, opts?:
DeploymentOptionOpts): DeploymentOption {
return {
- name: "Kogito Quarkus Blank App",
+ name: "Quarkus Blank App",
content: `
${DeploymentYaml(args)}
---
diff --git
a/packages/online-editor/src/devDeployments/services/kubernetes/KubernetesDeploymentOptions.ts
b/packages/online-editor/src/devDeployments/services/kubernetes/KubernetesDeploymentOptions.ts
index e38d6a1637d..a12930f752d 100644
---
a/packages/online-editor/src/devDeployments/services/kubernetes/KubernetesDeploymentOptions.ts
+++
b/packages/online-editor/src/devDeployments/services/kubernetes/KubernetesDeploymentOptions.ts
@@ -20,13 +20,13 @@
import { DeploymentOptionArgs } from "../types";
import { DeploymentOption, DeploymentOptionOpts } from
"../deploymentOptions/types";
import { CustomImageOption } from "../deploymentOptions/customImage";
-import { KogitoQuarkusBlankAppOption } from
"../deploymentOptions/kogitoQuarkusBlankApp";
-import { FormWebappServiceYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/FormWebappServiceYaml";
-import { FormWebappIngressYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/FormWebappIngressYaml";
-import { IngressYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/IngressYaml";
+import { QuarkusBlankAppOption } from "../deploymentOptions/quarkusBlankApp";
+import { FormWebappServiceYaml } from
"../deploymentOptions/quarkusBlankApp/FormWebappServiceYaml";
+import { FormWebappIngressYaml } from
"../deploymentOptions/quarkusBlankApp/FormWebappIngressYaml";
+import { IngressYaml } from "../deploymentOptions/quarkusBlankApp/IngressYaml";
export function KubernetesDeploymentOptions(args: DeploymentOptionArgs):
Array<DeploymentOption> {
- const kogitoQuarkusBlankAppOpts: DeploymentOptionOpts = {
+ const quarkusBlankAppOpts: DeploymentOptionOpts = {
parameters: {
includeDmnFormWebapp: {
id: "includeDmnFormWebapp",
@@ -115,5 +115,5 @@ export function KubernetesDeploymentOptions(args:
DeploymentOptionArgs): Array<D
},
],
};
- return [KogitoQuarkusBlankAppOption(args, kogitoQuarkusBlankAppOpts),
CustomImageOption(args, customImageOptionOpts)];
+ return [QuarkusBlankAppOption(args, quarkusBlankAppOpts),
CustomImageOption(args, customImageOptionOpts)];
}
diff --git
a/packages/online-editor/src/devDeployments/services/openshift/OpenShiftDeploymentOptions.ts
b/packages/online-editor/src/devDeployments/services/openshift/OpenShiftDeploymentOptions.ts
index 076966af0d7..d9d557d48e7 100644
---
a/packages/online-editor/src/devDeployments/services/openshift/OpenShiftDeploymentOptions.ts
+++
b/packages/online-editor/src/devDeployments/services/openshift/OpenShiftDeploymentOptions.ts
@@ -20,14 +20,14 @@
import { DeploymentOptionArgs } from "../types";
import { DeploymentOption, DeploymentOptionOpts, DeploymentParameter } from
"../deploymentOptions/types";
import { CustomImageOption } from "../deploymentOptions/customImage";
-import { KogitoQuarkusBlankAppOption } from
"../deploymentOptions/kogitoQuarkusBlankApp";
-import { FormWebappServiceYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/FormWebappServiceYaml";
-import { RouteYaml as KogitoQuarkusBlankAppRouteYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/RouteYaml";
-import { FormWebappRouteYaml } from
"../deploymentOptions/kogitoQuarkusBlankApp/FormWebappRouteYaml";
+import { QuarkusBlankAppOption } from "../deploymentOptions/quarkusBlankApp";
+import { FormWebappServiceYaml } from
"../deploymentOptions/quarkusBlankApp/FormWebappServiceYaml";
+import { RouteYaml as QuarkusBlankAppRouteYaml } from
"../deploymentOptions/quarkusBlankApp/RouteYaml";
+import { FormWebappRouteYaml } from
"../deploymentOptions/quarkusBlankApp/FormWebappRouteYaml";
import { RouteYaml as CustomImageRouteYaml } from
"../deploymentOptions/customImage/RouteYaml";
export function OpenShiftDeploymentOptions(args: DeploymentOptionArgs):
Array<DeploymentOption> {
- const kogitoQuarkusBlankAppOpts: DeploymentOptionOpts = {
+ const quarkusBlankAppOpts: DeploymentOptionOpts = {
parameters: {
includeDmnFormWebapp: {
id: "includeDmnFormWebapp",
@@ -56,10 +56,10 @@ export function OpenShiftDeploymentOptions(args:
DeploymentOptionArgs): Array<De
appendYamls: [FormWebappServiceYaml(), FormWebappRouteYaml()],
},
},
- appendYamls: [KogitoQuarkusBlankAppRouteYaml()],
+ appendYamls: [QuarkusBlankAppRouteYaml()],
};
const customImageOptionOpts: DeploymentOptionOpts = {
appendYamls: [CustomImageRouteYaml()],
};
- return [KogitoQuarkusBlankAppOption(args, kogitoQuarkusBlankAppOpts),
CustomImageOption(args, customImageOptionOpts)];
+ return [QuarkusBlankAppOption(args, quarkusBlankAppOpts),
CustomImageOption(args, customImageOptionOpts)];
}
diff --git a/packages/online-editor/src/devDeployments/services/types.ts
b/packages/online-editor/src/devDeployments/services/types.ts
index aa7310db85d..73b53c42d5b 100644
--- a/packages/online-editor/src/devDeployments/services/types.ts
+++ b/packages/online-editor/src/devDeployments/services/types.ts
@@ -91,7 +91,7 @@ export type Tokens = DevDeploymentTokens & {
export type TokensArg = Omit<Tokens, "labels" | "annotations"> &
Partial<Tokens>;
export type DeploymentOptionArgs = {
- kogitoQuarkusBlankAppImageUrl: string;
+ quarkusBlankAppImageUrl: string;
baseImageUrl: string;
dmnFormWebappImageUrl: string;
imagePullPolicy: string;
diff --git a/packages/online-editor/src/env/EnvJson.ts
b/packages/online-editor/src/env/EnvJson.ts
index 1c2838484c6..ed4824802e4 100644
--- a/packages/online-editor/src/env/EnvJson.ts
+++ b/packages/online-editor/src/env/EnvJson.ts
@@ -28,7 +28,7 @@ export interface EnvJson {
KIE_SANDBOX_CORS_PROXY_URL: string;
KIE_SANDBOX_FEEDBACK_URL: string;
KIE_SANDBOX_DEV_DEPLOYMENT_BASE_IMAGE_URL: string;
- KIE_SANDBOX_DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE_URL: string;
+ KIE_SANDBOX_DEV_DEPLOYMENT_QUARKUS_BLANK_APP_IMAGE_URL: string;
KIE_SANDBOX_DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE_URL: string;
KIE_SANDBOX_DEV_DEPLOYMENT_IMAGE_PULL_POLICY: string;
KIE_SANDBOX_REQUIRE_CUSTOM_COMMIT_MESSAGE: boolean;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da6dfa0b3a7..c08936ce399 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4042,7 +4042,7 @@ importers:
specifier: ^1.1.2
version: 1.1.2
- packages/dev-deployment-kogito-quarkus-blank-app:
+ packages/dev-deployment-quarkus-blank-app:
dependencies:
'@kie-tools/jbpm-quarkus-devui':
specifier: workspace:*
@@ -4058,14 +4058,14 @@ importers:
specifier: ^1.1.6
version: 1.1.6
- packages/dev-deployment-kogito-quarkus-blank-app-image:
+ packages/dev-deployment-quarkus-blank-app-image:
dependencies:
'@kie-tools/dev-deployment-base-image':
specifier: workspace:*
version: link:../dev-deployment-base-image
- '@kie-tools/dev-deployment-kogito-quarkus-blank-app':
+ '@kie-tools/dev-deployment-quarkus-blank-app':
specifier: workspace:*
- version: link:../dev-deployment-kogito-quarkus-blank-app
+ version: link:../dev-deployment-quarkus-blank-app
devDependencies:
'@kie-tools/image-builder':
specifier: workspace:*
diff --git a/repo/graph.dot b/repo/graph.dot
index 3ed38318da1..938067d671c 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -104,8 +104,8 @@ digraph G {
"@kie-tools/form-dmn" [ color = "blue", fontcolor = "blue", style =
"rounded" ];
"@kie-tools/dev-deployment-dmn-form-webapp-image" [ color = "black",
fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/image-env-to-json" [ color = "black", fontcolor = "black", style
= "dashed, rounded" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ color = "black",
fontcolor = "black", style = "dashed, rounded" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app" [ color = "black", fontcolor =
"black", style = "dashed, rounded" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app-image" [ color = "black",
fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/maven-m2-repo-via-http-image" [ color = "black", fontcolor =
"black", style = "dashed, rounded" ];
"@kie-tools/dmn-editor" [ color = "blue", fontcolor = "blue", style =
"rounded" ];
"@kie-tools/import-java-classes-component" [ color = "blue", fontcolor =
"blue", style = "rounded" ];
@@ -366,10 +366,10 @@ digraph G {
"@kie-tools/dev-deployment-dmn-form-webapp-image" ->
"@kie-tools/dev-deployment-dmn-form-webapp" [ style = "solid", color = "black"
];
"@kie-tools/dev-deployment-dmn-form-webapp-image" ->
"@kie-tools/image-env-to-json" [ style = "solid", color = "black" ];
"@kie-tools/dev-deployment-dmn-form-webapp-image" ->
"@kie-tools/image-builder" [ style = "dashed", color = "black" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app" ->
"@kie-tools/jbpm-quarkus-devui" [ style = "solid", color = "black" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" ->
"@kie-tools/dev-deployment-base-image" [ style = "solid", color = "black" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" ->
"@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ style = "solid", color =
"black" ];
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" ->
"@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app" ->
"@kie-tools/jbpm-quarkus-devui" [ style = "solid", color = "black" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app-image" ->
"@kie-tools/dev-deployment-base-image" [ style = "solid", color = "black" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app-image" ->
"@kie-tools/dev-deployment-quarkus-blank-app" [ style = "solid", color =
"black" ];
+ "@kie-tools/dev-deployment-quarkus-blank-app-image" ->
"@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ];
"@kie-tools/dev-deployment-upload-service" -> "@kie-tools/jest-base" [ style
= "dashed", color = "black" ];
"@kie-tools/dmn-editor" -> "@kie-tools-core/react-hooks" [ style = "solid",
color = "blue" ];
"@kie-tools/dmn-editor" -> "@kie-tools/boxed-expression-component" [ style =
"solid", color = "blue" ];
diff --git a/repo/graph.json b/repo/graph.json
index 18953cd9098..854d2edffbe 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -151,8 +151,8 @@
{ "id": "@kie-tools/form-dmn" },
{ "id": "@kie-tools/form" },
{ "id": "@kie-tools/dev-deployment-dmn-form-webapp-image" },
- { "id": "@kie-tools/dev-deployment-kogito-quarkus-blank-app" },
- { "id": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" },
+ { "id": "@kie-tools/dev-deployment-quarkus-blank-app" },
+ { "id": "@kie-tools/dev-deployment-quarkus-blank-app-image" },
{ "id": "@kie-tools/maven-m2-repo-via-http-image" },
{ "id": "@kie-tools/import-java-classes-component" },
{ "id": "@kie-tools/dmn-feel-antlr4-parser" },
@@ -1579,22 +1579,22 @@
"weight": 1
},
{
- "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app",
+ "source": "@kie-tools/dev-deployment-quarkus-blank-app",
"target": "@kie-tools/jbpm-quarkus-devui",
"weight": 1
},
{
- "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image",
+ "source": "@kie-tools/dev-deployment-quarkus-blank-app-image",
"target": "@kie-tools/dev-deployment-base-image",
"weight": 1
},
{
- "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image",
- "target": "@kie-tools/dev-deployment-kogito-quarkus-blank-app",
+ "source": "@kie-tools/dev-deployment-quarkus-blank-app-image",
+ "target": "@kie-tools/dev-deployment-quarkus-blank-app",
"weight": 1
},
{
- "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image",
+ "source": "@kie-tools/dev-deployment-quarkus-blank-app-image",
"target": "@kie-tools/maven-m2-repo-via-http-image",
"weight": 1
},
@@ -2845,11 +2845,8 @@
["@kie-tools/dev-deployment-base-image",
"packages/dev-deployment-base-image"],
["@kie-tools/dev-deployment-dmn-form-webapp",
"packages/dev-deployment-dmn-form-webapp"],
["@kie-tools/dev-deployment-dmn-form-webapp-image",
"packages/dev-deployment-dmn-form-webapp-image"],
- ["@kie-tools/dev-deployment-kogito-quarkus-blank-app",
"packages/dev-deployment-kogito-quarkus-blank-app"],
- [
- "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image",
- "packages/dev-deployment-kogito-quarkus-blank-app-image"
- ],
+ ["@kie-tools/dev-deployment-quarkus-blank-app",
"packages/dev-deployment-quarkus-blank-app"],
+ ["@kie-tools/dev-deployment-quarkus-blank-app-image",
"packages/dev-deployment-quarkus-blank-app-image"],
["@kie-tools/dev-deployment-upload-service",
"packages/dev-deployment-upload-service"],
["@kie-tools/dmn-editor", "packages/dmn-editor"],
["@kie-tools/dmn-editor-envelope", "packages/dmn-editor-envelope"],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
