update etcd to v3.5.22

Signed-off-by: haorenfsa <haorenfsa@gmail.com>

Author: haorenfsa

3.5/ubuntu22.04/Dockerfile

@@ -7,10 +7,10 @@ LABEL maintainer="Team DevOps of Zilliz <devops@zilliz.com" \
       org.opencontainers.image.description="Application packaged by Bitnami, polished by zilliztech" \
       org.opencontainers.image.licenses="Apache-2.0" \
       org.opencontainers.image.source="https://github.com/milvus-io/bitnami-docker-etcd" \
-      org.opencontainers.image.ref.name="3.5.21-r1" \
+      org.opencontainers.image.ref.name="3.5.22-r1" \
       org.opencontainers.image.title="etcd" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="3.5.21-r1"
+      org.opencontainers.image.version="3.5.22-r1"
 
 ENV HOME="/" \
     OS_ARCH_RAW="${TARGETARCH}" \
@@ -23,35 +23,28 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     OS_ARCH=`echo ${OS_ARCH_RAW}| sed 's|/|-|'` && \
-    curl -SsLf https://github.com/etcd-io/etcd/releases/download/v3.5.21/etcd-v3.5.21-${OS_ARCH}.tar.gz -O && \
-    tar -zxf "etcd-v3.5.21-${OS_ARCH}.tar.gz" && \
+    curl -SsLf https://github.com/etcd-io/etcd/releases/download/v3.5.22/etcd-v3.5.22-${OS_ARCH}.tar.gz -O && \
+    tar -zxf "etcd-v3.5.22-${OS_ARCH}.tar.gz" && \
     mkdir -p /opt/bitnami/etcd/bin && \
-    mv ./etcd-v3.5.21-${OS_ARCH}/etcd /opt/bitnami/etcd/bin/etcd && \
-    mv ./etcd-v3.5.21-${OS_ARCH}/etcdctl /opt/bitnami/etcd/bin/etcdctl && \
-    mv ./etcd-v3.5.21-${OS_ARCH}/etcdutl /opt/bitnami/etcd/bin/etcdutl && \
-    rm -rf "etcd-v3.5.21-${OS_ARCH}.tar.gz"
+    mv ./etcd-v3.5.22-${OS_ARCH}/etcd /opt/bitnami/etcd/bin/etcd && \
+    mv ./etcd-v3.5.22-${OS_ARCH}/etcdctl /opt/bitnami/etcd/bin/etcdctl && \
+    mv ./etcd-v3.5.22-${OS_ARCH}/etcdutl /opt/bitnami/etcd/bin/etcdutl && \
+    rm -rf "etcd-v3.5.22-${OS_ARCH}.tar.gz"
 RUN cd /tmp/bitnami/pkg/cache/ && \
-    OS_ARCH=`echo ${OS_ARCH_RAW}| sed 's|/|-|'` && \
-    COMPONENTS=( \
-      "yq-4.45.1-3-${OS_ARCH}-debian-12" \
-    ) && \
-    for COMPONENT in "${COMPONENTS[@]}"; do \
-      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
-        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
-        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
-      fi && \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
-    done
+    OS_ARCH=`echo ${OS_ARCH_RAW}| sed 's|/|_|'` && \
+    if [ ! -f "yq_${OS_ARCH}.tar.gz" ]; then \
+      curl -SsLf "https://github.com/mikefarah/yq/releases/download/v4.45.3/yq_${OS_ARCH}" -O ; \
+    fi && \
+    mkdir -p /opt/bitnami/common/bin/ && \
+    mv "yq_${OS_ARCH}" /opt/bitnami/common/bin/yq
 RUN apt-get autoremove --purge -y curl ca-certificates && \
     apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/etcd/postunpack.sh
-ENV APP_VERSION="3.5.21" \
+ENV APP_VERSION="3.5.22" \
     BITNAMI_APP_NAME="etcd" \
     ETCDCTL_API="3" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH"