try to fix python (#185)

streamnative · Jun 3, 2021 · 5b35b6b · 5b35b6b
1 parent 733beb4
commit 5b35b6b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/images/pulsar-functions-python-runner/Dockerfile b/images/pulsar-functions-python-runner/Dockerfile
@@ -6,7 +6,12 @@ FROM pulsar-functions-runner-base:latest
 COPY --from=pulsar --chown=pulsar:0 /pulsar/instances/python-instance /pulsar/instances/python-instance
 COPY --from=pulsar --chown=pulsar:0 /pulsar/instances/deps /pulsar/instances/deps
 COPY --from=pulsar --chown=pulsar:0 /pulsar/pulsar-client /pulsar/pulsar-client
-COPY --from=pulsar --chown=pulsar:0 /pulsar/cpp-client /pulsar/cpp-client
+# Pulsar 2.8.0 removes /pulsar/cpp-client from docker image
+# But it required with Pulsar 2.7.X and below
+# to make this Dockerfile compalicate with different Pulsar versions
+# Below is a hacky way to copy /pulsar/cpp-client if exist in pulsar image
+COPY --from=pulsar --chown=pulsar:0 /pulsar/README /pulsar/cpp-clien* /tmp/pulsar/
+RUN mv /tmp/pulsar/cpp-client /pulsar/cpp-client || true
 
 # Install some utilities
 RUN apt-get update \
@@ -20,9 +25,9 @@ RUN python3.7 get-pip.py
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 10
 
-RUN apt-get update \
+RUN if [ -d "/pulsar/cpp-client" ]; then apt-get update \
      && apt install -y /pulsar/cpp-client/*.deb \
-     && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt/lists/*
+     && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt/lists/* ; fi
 
 WORKDIR /pulsar