Update

streamnative · May 4, 2023 · bad294f · bad294f
1 parent c9e2f65
commit bad294f
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/images/pulsar-functions-base-runner/Dockerfile b/images/pulsar-functions-base-runner/Dockerfile
@@ -23,42 +23,47 @@ RUN mkdir -p /pulsar/bin/ \
 ARG PULSAR_IMAGE_TAG
 ENV VERSION_TAG=${PULSAR_IMAGE_TAG}
 
-ADD https://github.com/streamnative/pulsarctl/releases/download/v$VERSION_TAG/pulsarctl-amd64-linux.tar.gz /pulsar/bin/
-
 RUN echo "VERSION_TAG=${VERSION_TAG}" && \
     VERSION_MAJOR=$(echo $VERSION_TAG | cut -d. -f1) && \
     VERSION_MINOR=$(echo $VERSION_TAG | cut -d. -f2) && \
     VERSION_PATCH=$(echo $VERSION_TAG | cut -d. -f3) && \
     if [ $VERSION_MAJOR -eq 2 ] && [ $VERSION_MINOR -eq 7 ]; then \
         echo "Pulsar version is 2.7, use java 1.8" && \
-        export JRE_PACKAGE_NAME=openjdk-8-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-8-jre-headless && \
+        export PULSARCTL_RELEASE=2.7.4.8; \
     elif [ $VERSION_MAJOR -eq 2 ] && [ $VERSION_MINOR -eq 8 ]; then \
         echo "Pulsar version is 2.8, use java 1.8" && \
-        export JRE_PACKAGE_NAME=openjdk-8-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-8-jre-headless && \
+        export PULSARCTL_RELEASE=2.8.4.2; \
     elif [ $VERSION_MAJOR -eq 2 ] && [ $VERSION_MINOR -eq 9 ]; then \
         echo "Pulsar version is 2.9, use java 11" && \
-        export JRE_PACKAGE_NAME=openjdk-11-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-11-jre-headless && \
+        export PULSARCTL_RELEASE=2.9.4.6; \
     elif [ $VERSION_MAJOR -eq 2 ] && [ $VERSION_MINOR -eq 10 ]; then \
         echo "Pulsar version is 2.10, use java 11" && \
-        export JRE_PACKAGE_NAME=openjdk-11-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-11-jre-headless && \
+        export PULSARCTL_RELEASE=2.10.4.1; \
     elif [ $VERSION_MAJOR -eq 2 ] && [ $VERSION_MINOR -eq 11 ]; then \
         echo "Pulsar version is 2.11, use java 17" && \
-        export JRE_PACKAGE_NAME=openjdk-17-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-17-jre-headless && \
+        export PULSARCTL_RELEASE=2.11.1.0; \
     else \
         echo "Pulsar version is not in the list, use java 17 instead" && \
-        export JRE_PACKAGE_NAME=openjdk-17-jre-headless; \
+        export JRE_PACKAGE_NAME=openjdk-17-jre-headless && \
+        export PULSARCTL_RELEASE=3.0.0.1-rc1; \
     fi && \
-    tar -xzf /pulsar/bin/pulsarctl-amd64-linux.tar.gz -C /pulsar/bin/ && \
-    rm -rf /pulsar/bin/pulsarctl-amd64-linux.tar.gz && \
-    chmod +x /pulsar/bin/pulsarctl-amd64-linux/pulsarctl && \
-    ln -s /pulsar/bin/pulsarctl-amd64-linux/pulsarctl /usr/bin/pulsarctl && \
     apt-get update \
          && apt-get -y dist-upgrade \
-         && apt-get -y install $JRE_PACKAGE_NAME \
+         && apt-get -y install $JRE_PACKAGE_NAME wget \
          && apt-get -y --purge autoremove \
          && apt-get autoclean \
          && apt-get clean \
-         && rm -rf /var/lib/apt/lists/*
+         && rm -rf /var/lib/apt/lists/* \
+         && wget https://github.com/streamnative/pulsarctl/releases/download/v$PULSARCTL_RELEASE/pulsarctl-amd64-linux.tar.gz -P /pulsar/bin/ \
+         && tar -xzf /pulsar/bin/pulsarctl-amd64-linux.tar.gz -C /pulsar/bin/ \
+         && rm -rf /pulsar/bin/pulsarctl-amd64-linux.tar.gz \
+         && chmod +x /pulsar/bin/pulsarctl-amd64-linux/pulsarctl \
+         && ln -s /pulsar/bin/pulsarctl-amd64-linux/pulsarctl /usr/bin/pulsarctl
 
 COPY --from=pulsar --chown=$UID:$GID /pulsar/conf /pulsar/conf
 COPY --from=pulsar --chown=$UID:$GID /pulsar/bin /pulsar/bin