This is an automated email from the ASF dual-hosted git repository. nicoloboschi pushed a commit to branch branch-2.11 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 60a79050538e5d7747dce2b080449155ad9801aa Author: Nicolò Boschi <[email protected]> AuthorDate: Fri Sep 2 11:29:48 2022 +0200 [fix][cli] Exclude windows script from the docker image (#17404) (cherry picked from commit 3da319cb0898734c6c747b4cd27260fdb861cfd9) --- distribution/shell/src/assemble/shell.xml | 10 ++++++++++ docker/pulsar/Dockerfile | 1 + 2 files changed, 11 insertions(+) diff --git a/distribution/shell/src/assemble/shell.xml b/distribution/shell/src/assemble/shell.xml index af1f229c7f7..567402f504a 100644 --- a/distribution/shell/src/assemble/shell.xml +++ b/distribution/shell/src/assemble/shell.xml @@ -50,6 +50,16 @@ <source>${basedir}/../../bin/pulsar-shell</source> <fileMode>755</fileMode> </file> + <file> + <outputDirectory>bin</outputDirectory> + <source>${basedir}/../../bin/pulsar-admin-common.cmd</source> + <fileMode>755</fileMode> + </file> + <file> + <outputDirectory>bin</outputDirectory> + <source>${basedir}/../../bin/pulsar-shell.cmd</source> + <fileMode>755</fileMode> + </file> <file> <outputDirectory>conf</outputDirectory> <source>${basedir}/../../conf/client.conf</source> diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 27fef14fb76..6450668ccd2 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -24,6 +24,7 @@ ARG PULSAR_TARBALL ADD ${PULSAR_TARBALL} / RUN mv /apache-pulsar-* /pulsar +RUN rm -rf /pulsar/bin/*.cmd COPY scripts/apply-config-from-env.py /pulsar/bin COPY scripts/apply-config-from-env-with-prefix.py /pulsar/bin
