From 5057a8a4f4e30afb8f2c759201797037704743bd Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Tue, 29 Oct 2024 17:15:54 +0800 Subject: [PATCH] Fix error --- .../integration/cases/java-download-function/manifests.yaml | 2 ++ images/pulsar-functions-base-runner/Dockerfile | 2 -- images/pulsar-functions-java-runner/Dockerfile | 3 +++ images/pulsar-functions-java-runner/pulsarctl.Dockerfile | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.ci/tests/integration/cases/java-download-function/manifests.yaml b/.ci/tests/integration/cases/java-download-function/manifests.yaml index 4763bae5a..6827baf8d 100644 --- a/.ci/tests/integration/cases/java-download-function/manifests.yaml +++ b/.ci/tests/integration/cases/java-download-function/manifests.yaml @@ -49,6 +49,8 @@ spec: java: jar: pulsar-functions-api-examples.jar jarLocation: function://public/default/test-java-function + log: + javaLog4JConfigFileType: "yaml" # to be delete & use admission hook clusterName: test autoAck: true diff --git a/images/pulsar-functions-base-runner/Dockerfile b/images/pulsar-functions-base-runner/Dockerfile index 17fa3a49f..622d3be21 100644 --- a/images/pulsar-functions-base-runner/Dockerfile +++ b/images/pulsar-functions-base-runner/Dockerfile @@ -61,8 +61,6 @@ RUN rm -rf /pulsar/lib/presto || true RUN rm -rf /pulsar/conf/presto || true RUN rm -rf /pulsar/bin/pulsar-detector || true -RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/ || true - ENV PULSAR_ROOT_LOGGER=INFO,CONSOLE ENV java.io.tmpdir=/pulsar/tmp/ diff --git a/images/pulsar-functions-java-runner/Dockerfile b/images/pulsar-functions-java-runner/Dockerfile index 672befe98..e529da5c4 100644 --- a/images/pulsar-functions-java-runner/Dockerfile +++ b/images/pulsar-functions-java-runner/Dockerfile @@ -6,6 +6,9 @@ FROM pulsar-functions-runner-base:latest COPY --from=pulsar --chown=$UID:$GID /pulsar/instances/java-instance.jar /pulsar/instances/java-instance.jar COPY --from=pulsar --chown=$UID:$GID /pulsar/instances/deps /pulsar/instances/deps +RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/dataformat-jackson-dataformat-yaml.jar \ + && cp /pulsar/lib/org.yaml-snakeyaml-*.jar /pulsar/instances/deps/org.yaml-snakeyaml.jar + WORKDIR /pulsar USER $USER diff --git a/images/pulsar-functions-java-runner/pulsarctl.Dockerfile b/images/pulsar-functions-java-runner/pulsarctl.Dockerfile index 0a66a7f69..2545190b4 100644 --- a/images/pulsar-functions-java-runner/pulsarctl.Dockerfile +++ b/images/pulsar-functions-java-runner/pulsarctl.Dockerfile @@ -45,7 +45,8 @@ RUN rm -rf /pulsar/lib/io.vertx-vertx-core-*.jar || true RUN rm -rf /pulsar/lib/presto || true RUN rm -rf /pulsar/conf/presto || true -RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/ || true +RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/dataformat-jackson-dataformat-yaml.jar \ + && cp /pulsar/lib/org.yaml-snakeyaml-*.jar /pulsar/instances/deps/org.yaml-snakeyaml.jar ENV PULSAR_ROOT_LOGGER=INFO,CONSOLE ENV java.io.tmpdir=/pulsar/tmp/