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-serverless-operator.git
The following commit(s) were added to refs/heads/main by this push:
new f80dd84a kie-kogito-serverless-operator-411: incorporate the
MAVEN_ARGS_APPEND argument to the swf-builder (#412)
f80dd84a is described below
commit f80dd84a278c3a1c1d59b2d3cf81f927639834de
Author: Walter Medvedeo <[email protected]>
AuthorDate: Tue Feb 27 20:40:47 2024 +0100
kie-kogito-serverless-operator-411: incorporate the MAVEN_ARGS_APPEND
argument to the swf-builder (#412)
---
.../manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml | 3 ++-
.../manifests/sonataflow-operator-builder-config_v1_configmap.yaml | 5 +++--
config/manager/osl/sonataflow_builder_dockerfile.yaml | 4 +++-
config/manager/sonataflow_builder_dockerfile.yaml | 2 ++
operator.yaml | 5 +++--
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/bundle.osl/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml
b/bundle.osl/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml
index fad50726..76405972 100644
--- a/bundle.osl/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml
+++ b/bundle.osl/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml
@@ -5,7 +5,8 @@ data:
Dockerfile: "FROM
registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:latest
AS builder\n\n# variables that can be overridden by the builder\n# To add
a Quarkus
extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to
the Quarkus
- CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n \n# Copy from
build
+ CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional
java/mvn arguments to pass to the builder\n
+ ARG MAVEN_ARGS_APPEND\n\n# Copy from build
context to skeleton resources project\nCOPY --chmod=644 *
./resources/\n\nRUN
/home/kogito/launch/build-app.sh ./resources\n
\n#=============================\n#
Runtime Run\n#=============================\nFROM
registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV
diff --git
a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
index ab8cabb5..2d787ee0 100644
--- a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
+++ b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
@@ -5,8 +5,9 @@ data:
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS
builder\n\n#
variables that can be overridden by the builder\n# To add a Quarkus
extension
to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus
CLI
- add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build
context
- to skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN
/home/kogito/launch/build-app.sh
+ add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional
java/mvn arguments
+ to pass to the builder\nARG MAVEN_ARGS_APPEND\n\n# Copy from build context
to
+ skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN
/home/kogito/launch/build-app.sh
./resources\n \n#=============================\n# Runtime
Run\n#=============================\nFROM
registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV
LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
\ \n# We make four distinct layers so if there are application changes the
library
diff --git a/config/manager/osl/sonataflow_builder_dockerfile.yaml
b/config/manager/osl/sonataflow_builder_dockerfile.yaml
index c0aade94..d09c4c40 100644
--- a/config/manager/osl/sonataflow_builder_dockerfile.yaml
+++ b/config/manager/osl/sonataflow_builder_dockerfile.yaml
@@ -5,7 +5,9 @@ FROM
registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rh
ARG QUARKUS_EXTENSIONS
# Args to pass to the Quarkus CLI add extension command
ARG QUARKUS_ADD_EXTENSION_ARGS
-
+# Additional java/mvn arguments to pass to the builder
+ARG MAVEN_ARGS_APPEND
+
# Copy from build context to skeleton resources project
COPY --chown=1001 . ./resources
diff --git a/config/manager/sonataflow_builder_dockerfile.yaml
b/config/manager/sonataflow_builder_dockerfile.yaml
index 20c34c1d..d95cbf0f 100644
--- a/config/manager/sonataflow_builder_dockerfile.yaml
+++ b/config/manager/sonataflow_builder_dockerfile.yaml
@@ -5,6 +5,8 @@ FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS
builder
ARG QUARKUS_EXTENSIONS
# Args to pass to the Quarkus CLI add extension command
ARG QUARKUS_ADD_EXTENSION_ARGS
+# Additional java/mvn arguments to pass to the builder
+ARG MAVEN_ARGS_APPEND
# Copy from build context to skeleton resources project
COPY --chown=1001 . ./resources
diff --git a/operator.yaml b/operator.yaml
index 74247a7d..0b412c0d 100644
--- a/operator.yaml
+++ b/operator.yaml
@@ -26696,8 +26696,9 @@ data:
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS
builder\n\n#
variables that can be overridden by the builder\n# To add a Quarkus
extension
to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus
CLI
- add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build
context
- to skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN
/home/kogito/launch/build-app.sh
+ add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional
java/mvn arguments
+ to pass to the builder\nARG MAVEN_ARGS_APPEND\n\n# Copy from build context
to
+ skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN
/home/kogito/launch/build-app.sh
./resources\n \n#=============================\n# Runtime
Run\n#=============================\nFROM
registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV
LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
\ \n# We make four distinct layers so if there are application changes the
library
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
