diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml index 0db23c680..f2a99f7a7 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/ubi-minimal:latest" +from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" description: "Runtime image for Kogito Jobs Service with all available jdbc providers" labels: @@ -48,18 +48,12 @@ envs: example: "postgresql" description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral and postgresql, if empty, defaults to ephemeral" -packages: - manager: microdnf - modules: repositories: - path: modules install: - - name: org.kie.kogito.image.dependencies - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.allinone diff --git a/modules/kogito-data-index-ephemeral/community/configure b/modules/kogito-data-index-ephemeral/community/configure index aefeea7d9..ae5360b77 100644 --- a/modules/kogito-data-index-ephemeral/community/configure +++ b/modules/kogito-data-index-ephemeral/community/configure @@ -19,12 +19,8 @@ # set -e -SOURCES_DIR=/tmp/artifacts SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added -mkdir -p "${KOGITO_HOME}"/bin/ -cp -vr ${SOURCES_DIR}/quarkus-app "${KOGITO_HOME}"/bin/ - cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml index ee18c5eb0..5a975f608 100644 --- a/modules/kogito-data-index-ephemeral/community/module.yaml +++ b/modules/kogito-data-index-ephemeral/community/module.yaml @@ -24,6 +24,7 @@ version: "999-SNAPSHOT" # called by the Makefile before builds artifacts: - path: /tmp/build/data-index-service-inmemory + dest: /home/kogito/bin name: quarkus-app execute: diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure index aefeea7d9..ae5360b77 100644 --- a/modules/kogito-data-index-postgresql/configure +++ b/modules/kogito-data-index-postgresql/configure @@ -19,12 +19,8 @@ # set -e -SOURCES_DIR=/tmp/artifacts SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added -mkdir -p "${KOGITO_HOME}"/bin/ -cp -vr ${SOURCES_DIR}/quarkus-app "${KOGITO_HOME}"/bin/ - cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml index ee1b6013a..d5037af86 100644 --- a/modules/kogito-data-index-postgresql/module.yaml +++ b/modules/kogito-data-index-postgresql/module.yaml @@ -24,6 +24,7 @@ version: "999-SNAPSHOT" # called by the Makefile before builds artifacts: - path: /tmp/build/data-index-service-postgresql + dest: /home/kogito/bin name: quarkus-app execute: diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure index 6777f4806..04cf35c1f 100644 --- a/modules/kogito-jobs-service-all-in-one/configure +++ b/modules/kogito-jobs-service-all-in-one/configure @@ -19,14 +19,9 @@ # set -e -SOURCES_DIR=/tmp/artifacts SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added -unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral -unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql - - mkdir "${KOGITO_HOME}"/bin/shared-libs/ mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/ diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml index aa890d326..1ef0ffff5 100644 --- a/modules/kogito-jobs-service-all-in-one/module.yaml +++ b/modules/kogito-jobs-service-all-in-one/module.yaml @@ -21,14 +21,12 @@ name: org.kie.kogito.jobs.service.allinone version: "999-SNAPSHOT" artifacts: - - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip - name: jobs-service-inmemory-quarkus-app.zip - - path: /tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip - name: jobs-service-postgresql-quarkus-app.zip - -packages: - install: - - pam + - path: /tmp/build/jobs-service-inmemory-all-in-one + name: jobs-service-inmemory-all-in-one + dest: /home/kogito/bin/ephemeral + - path: /tmp/build/jobs-service-postgresql-all-in-one + name: jobs-service-postgresql-all-in-one + dest: /home/kogito/bin/postgresql execute: - script: configure diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure index 30ce277f5..10d0d252b 100644 --- a/modules/kogito-jobs-service-ephemeral/configure +++ b/modules/kogito-jobs-service-ephemeral/configure @@ -19,12 +19,8 @@ # set -e -SOURCES_DIR=/tmp/artifacts SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added -mkdir -p "${KOGITO_HOME}"/bin/ephemeral -cp -vr ${SOURCES_DIR}/quarkus-app "${KOGITO_HOME}"/bin/ephemeral - cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml index e7cfd8241..1aeac4351 100644 --- a/modules/kogito-jobs-service-ephemeral/module.yaml +++ b/modules/kogito-jobs-service-ephemeral/module.yaml @@ -24,6 +24,7 @@ version: "999-SNAPSHOT" # called by the Makefile before builds artifacts: - path: /tmp/build/jobs-service-inmemory + dest: /home/kogito/bin/ephemeral name: quarkus-app execute: diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure index 1f23e5545..10d0d252b 100644 --- a/modules/kogito-jobs-service-postgresql/configure +++ b/modules/kogito-jobs-service-postgresql/configure @@ -19,12 +19,8 @@ # set -e -SOURCES_DIR=/tmp/artifacts SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added -mkdir -p "${KOGITO_HOME}"/bin/postgresql -cp -vr ${SOURCES_DIR}/quarkus-app "${KOGITO_HOME}"/bin/postgresql - cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml index 531b4309f..95da8e909 100644 --- a/modules/kogito-jobs-service-postgresql/module.yaml +++ b/modules/kogito-jobs-service-postgresql/module.yaml @@ -24,6 +24,7 @@ version: "999-SNAPSHOT" # called by the Makefile before builds artifacts: - path: /tmp/build/jobs-service-postgresql + dest: /home/kogito/bin/postgresql name: quarkus-app execute: