Merge pull request #1555 from k8s-infra-cherrypick-robot/cherry-pick-…

…1553-to-release-1.29 [release-1.29] feat: upgrade azcopy to 10.21.2
kubernetes-sigs · Nov 9, 2023 · 812ff1b · 812ff1b
2 parents 3588d8b + cfc6f14
commit 812ff1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.trivyignore b/.trivyignore
diff --git a/pkg/azurefileplugin/Dockerfile b/pkg/azurefileplugin/Dockerfile
@@ -18,17 +18,18 @@ ARG ARCH=amd64
 ARG binary=./_output/${ARCH}/azurefileplugin
 COPY ${binary} /azurefileplugin
 
-RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfsprogs nfs-common netbase curl
+RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfsprogs nfs-common netbase wget
 
 # install azcopy
-ARG azcopyURL=https://aka.ms/downloadazcopy-v10-linux
+ARG azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_linux_amd64_10.21.2.tar.gz
 RUN if [ "$ARCH" == "arm64" ] ; then \
-  azcopyURL=${azcopyURL}"-arm64"; fi
-RUN curl -sL ${azcopyURL} | tar -xz && \
+  azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_linux_arm64_10.21.2.tar.gz; fi
+RUN wget -O azcopy.tar.gz ${azcopyURL} && \
+  tar xvzf azcopy.tar.gz -C . && rm azcopy.tar.gz && \
   mv ./azcopy_linux_$ARCH_*/azcopy /usr/local/bin/azcopy && \
   rm -rf ./azcopy_linux_$ARCH_*
 RUN chmod +x /usr/local/bin/azcopy
-RUN apt remove curl -y
+RUN apt remove wget -y
 
 LABEL maintainers="andyzhangx"
 LABEL description="AzureFile CSI Driver"