Update alpine to 3.20 to fix CVEs (#758)

jiangpengcheng · web-flow · commit a13cddc8ae4f · 2024-05-23T10:06:21.000+08:00
* Update alpine to 3.20 to fix CVEs

* Fix runner error
diff --git a/images/pulsar-functions-base-runner/Dockerfile b/images/pulsar-functions-base-runner/Dockerfile
@@ -1,7 +1,7 @@
 ARG PULSAR_IMAGE
 ARG PULSAR_IMAGE_TAG
 FROM ${PULSAR_IMAGE}:${PULSAR_IMAGE_TAG} as pulsar
-FROM alpine:3.19 as functions-runner
+FROM alpine:3.20 as functions-runner
 
 ENV GID=10001
 ENV UID=10000
diff --git a/images/pulsar-functions-base-runner/pulsarctl.Dockerfile b/images/pulsar-functions-base-runner/pulsarctl.Dockerfile
@@ -1,7 +1,7 @@
 ARG PULSAR_IMAGE
 ARG PULSAR_IMAGE_TAG
 FROM ${PULSAR_IMAGE}:${PULSAR_IMAGE_TAG} as pulsar
-FROM alpine:3.19 as functions-runner
+FROM alpine:3.20 as functions-runner
 
 ENV GID=10001
 ENV UID=10000
diff --git a/images/pulsar-functions-python-runner/Dockerfile b/images/pulsar-functions-python-runner/Dockerfile
@@ -23,7 +23,7 @@ RUN if [ -d "/tmp/pulsar/cpp-client" ]; then mv /tmp/pulsar/cpp-client /pulsar/c
 # Install some utilities
 RUN apk update \
      && apk add --no-cache python3 python3-dev tk-dev curl ca-certificates\
-     && mv /usr/lib/python3.11/EXTERNALLY-MANAGED  /usr/lib/python3.11/EXTERNALLY-MANAGED.old
+     && mv /usr/lib/python3.*/EXTERNALLY-MANAGED  /tmp/EXTERNALLY-MANAGED.old
 
 RUN mkdir -p /etc/pki/tls/certs && cp /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt
 
diff --git a/images/pulsar-functions-python-runner/pulsarctl.Dockerfile b/images/pulsar-functions-python-runner/pulsarctl.Dockerfile
@@ -23,7 +23,7 @@ RUN apk update \
      && apk add --no-cache python3 python3-dev tk-dev curl ca-certificates\
      && mkdir -p /etc/pki/tls/certs && cp /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt \
      && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-     && mv /usr/lib/python3.11/EXTERNALLY-MANAGED  /usr/lib/python3.11/EXTERNALLY-MANAGED.old \
+     && mv /usr/lib/python3.*/EXTERNALLY-MANAGED  /tmp/EXTERNALLY-MANAGED.old \
      && python3 get-pip.py && pip3 install --upgrade pip
 
 RUN if [ -f "/pulsar/bin/install-pulsar-client-37.sh" ]; then /pulsar/bin/install-pulsar-client-37.sh || pip3 install 'pulsar-client[all]==3.5.0' ; else pip3 install 'pulsar-client[all]==3.5.0' ; fi
diff --git a/operator.Dockerfile b/operator.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN apk add tzdata --no-cache
 RUN apk upgrade --no-cache

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.19`
	`1`	`+FROM alpine:3.20`
`2`	`2`
`3`	`3`	`RUN apk add tzdata --no-cache`
`4`	`4`	`RUN apk upgrade --no-cache`