This is an automated email from the ASF dual-hosted git repository.

ricardozanini pushed a commit to branch main
in repository 
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git


The following commit(s) were added to refs/heads/main by this push:
     new 866d09ff Reintroduce image Kogito Base Builder for Web Tools (#1754)
866d09ff is described below

commit 866d09ffa2cdbc90ee73d517ed1ff40e0433b0a8
Author: Ricardo Zanini <[email protected]>
AuthorDate: Thu Apr 11 15:05:21 2024 -0300

    Reintroduce image Kogito Base Builder for Web Tools (#1754)
    
    * Reintroduce image Kogito Base Builder for Web Tools
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    * Restore Makefile verbose options
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    ---------
    
    Signed-off-by: Ricardo Zanini <[email protected]>
---
 ...er-image.yaml => kogito-base-builder-image.yaml | 38 +++++++++++-----------
 kogito-data-index-ephemeral-image.yaml             |  2 +-
 kogito-data-index-postgresql-image.yaml            |  2 +-
 kogito-imagestream.yaml                            | 21 ++++++++++++
 kogito-jit-runner-image.yaml                       |  2 +-
 kogito-jobs-service-allinone-image.yaml            |  2 +-
 kogito-jobs-service-ephemeral-image.yaml           |  2 +-
 kogito-jobs-service-postgresql-image.yaml          |  2 +-
 kogito-management-console-image.yaml               |  2 +-
 kogito-swf-builder-image.yaml                      |  4 +--
 kogito-swf-devmode-image.yaml                      |  4 +--
 kogito-task-console-image.yaml                     |  2 +-
 scripts/common.py                                  |  2 +-
 tests/features/common.feature                      |  1 +
 14 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/kogito-jit-runner-image.yaml b/kogito-base-builder-image.yaml
similarity index 69%
copy from kogito-jit-runner-image.yaml
copy to kogito-base-builder-image.yaml
index 0907088b..fc785452 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -18,29 +18,33 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jit-runner"
+name: "quay.io/kiegroup/kogito-base-builder"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
-description: "Runtime image for Kogito JIT Runner"
+from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+description: "Image with JDK and Maven, used as a base image. It is used by 
Web Tools !"
 
 labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "3.2.10.Final"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <[email protected]>"
   - name: "io.k8s.description"
-    value: "Runtime image for Kogito JIT Runner"
+    value: "Platform for building Kogito based on JDK and Maven"
   - name: "io.k8s.display-name"
-    value: "Kogito JIT Runner"
+    value: "Kogito based on JDK and Maven"
   - name: "io.openshift.tags"
-    value: "kogito,jit-runner"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
+    value: "base-builder,kogito"
 
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed 
with the -x option, printing the commands and their arguments as they are 
executed. Also debug JVM initialization."
+packages:
+  manager: microdnf
 
 modules:
   repositories:
@@ -48,16 +52,12 @@ modules:
   install:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.jit-runner
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven.common
+    - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.security.custom.truststores
 
-ports:
-  - value: 8080
-
 run:
   workdir: "/home/kogito"
   user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
diff --git a/kogito-data-index-ephemeral-image.yaml 
b/kogito-data-index-ephemeral-image.yaml
index 4801a69e..22eeecb4 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for ephemeral 
PostgreSQL persistence provider"
 
 labels:
diff --git a/kogito-data-index-postgresql-image.yaml 
b/kogito-data-index-postgresql-image.yaml
index 3f41ff43..048ae5c1 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL 
persistence provider"
 
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 71fec570..a9d24737 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -45,6 +45,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-base-builder
+      annotations:
+        openshift.io/display-name: Kogito base builder
+        openshift.io/provider-display-name: KIE Group.
+    spec:
+      tags:
+        - name: '999-SNAPSHOT'
+          annotations:
+            description: Kogito base builder
+            iconClass: icon-jbpm
+            tags: kogito,jdk,maven
+            supports: quarkus
+            version: '999-SNAPSHOT'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 0907088b..61757a9f 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
diff --git a/kogito-jobs-service-allinone-image.yaml 
b/kogito-jobs-service-allinone-image.yaml
index f2a99f7a..ea7c283d 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc 
providers"
 
 labels:
diff --git a/kogito-jobs-service-ephemeral-image.yaml 
b/kogito-jobs-service-ephemeral-image.yaml
index d26ce19c..c9b0b2e8 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
diff --git a/kogito-jobs-service-postgresql-image.yaml 
b/kogito-jobs-service-postgresql-image.yaml
index df50edcc..48eaf58f 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
diff --git a/kogito-management-console-image.yaml 
b/kogito-management-console-image.yaml
index 62ee2284..63e878ce 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Management Console"
 
 labels:
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 5749630e..59cad93c 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     modules:
       repositories:
@@ -34,7 +34,7 @@
         - name: org.kie.kogito.swf.common.build
 
   - name: "quay.io/kiegroup/kogito-swf-builder"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow base builder with Quarkus 
extensions libraries preinstalled"
 
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 2b61576a..18e918c8 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     modules:
       repositories:
@@ -37,7 +37,7 @@
       manager: microdnf
 
   - name: "quay.io/kiegroup/kogito-swf-devmode"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow development mode with Quarkus 
extensions libraries preinstalled"
 
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 2031de62..39c89643 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Task Console"
 
 labels:
diff --git a/scripts/common.py b/scripts/common.py
index 39a61387..8d1770ff 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -53,7 +53,7 @@ SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral",
                               "kogito-management-console", 
"kogito-task-console"
                               }
 
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode"}
+SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", 
"kogito-base-builder"}
 
 
 def yaml_loader():
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 678ef79a..0f2ba31c 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -6,6 +6,7 @@
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
[email protected]/kiegroup/kogito-base-builder
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to