From 27e0569a16e8546a3bdc985b2229c8727197e7f1 Mon Sep 17 00:00:00 2001 From: Walter Medvedeo Date: Tue, 27 Feb 2024 13:34:10 +0100 Subject: [PATCH] kie-kogito-serverless-operator-411: incorporate the MAVEN_ARGS_APPEND argument to the swf-builder --- .../logic-operator-rhel8-builder-config_v1_configmap.yaml | 3 ++- .../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 fad50726a..76405972e 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 ab8cabb58..2d787ee01 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 c0aade94d..d09c4c40c 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 20c34c1d2..d95cbf0fd 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 74247a7de..0b412c0da 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