Add curl, tar, unzip and zip to docker images for vcpkg compatibility.

wupeka · wupeka · commit dd1dbced65f9 · 2025-08-28T08:04:40.000Z
diff --git a/devops/docker/almalinux-9-amd64/Dockerfile b/devops/docker/almalinux-9-amd64/Dockerfile
@@ -11,7 +11,10 @@ RUN dnf install -y \
     libtool \
     make \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/amazonlinux-2-amd64/Dockerfile b/devops/docker/amazonlinux-2-amd64/Dockerfile
@@ -3,6 +3,7 @@ FROM amazonlinux:2
 
 RUN yum install -y \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
@@ -11,7 +12,10 @@ RUN yum install -y \
     libtool \
     make \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/azurelinux-3-amd64/Dockerfile b/devops/docker/azurelinux-3-amd64/Dockerfile
@@ -6,6 +6,7 @@ RUN tdnf install -y \
     build-essential \
     ca-certificates \
     cmake \
+    curl \
     curl-devel \
     file \
     gcovr \
diff --git a/devops/docker/centos-7-amd64/Dockerfile b/devops/docker/centos-7-amd64/Dockerfile
@@ -6,6 +6,7 @@ COPY centos.repo /etc/yum.repos.d/centos.repo
 
 RUN yum install -y \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
@@ -14,7 +15,10 @@ RUN yum install -y \
     libtool \
     make \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/centos-8-amd64/Dockerfile b/devops/docker/centos-8-amd64/Dockerfile
@@ -12,6 +12,7 @@ RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|
 
 RUN yum update -y && yum install -y \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
@@ -20,7 +21,10 @@ RUN yum update -y && yum install -y \
     libtool \
     make \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/debian-10-amd64/Dockerfile b/devops/docker/debian-10-amd64/Dockerfile
@@ -22,7 +22,10 @@ RUN apt -y update && apt-get -y install \
     wget \
     gcovr \
     jq \
-    bc
+    bc \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/debian-11-amd64/Dockerfile b/devops/docker/debian-11-amd64/Dockerfile
@@ -16,7 +16,10 @@ RUN apt -y update && apt-get -y install \
     gcovr \
     jq \
     bc \
-    file
+    file \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/debian-12-amd64/Dockerfile b/devops/docker/debian-12-amd64/Dockerfile
@@ -18,7 +18,10 @@ RUN apt -y update && apt-get -y install \
     gcovr \
     jq \
     bc \
-    file
+    file \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/debian-9-amd64/Dockerfile b/devops/docker/debian-9-amd64/Dockerfile
@@ -23,7 +23,10 @@ RUN apt -y update && apt-get -y install \
     wget \
     gcovr \
     jq \
-    bc
+    bc \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/mariner-2-amd64/Dockerfile b/devops/docker/mariner-2-amd64/Dockerfile
@@ -5,6 +5,7 @@ RUN tdnf install -y \
     build-essential \
     ca-certificates \
     cmake \
+    curl \
     curl-devel \
     file \
     gcovr \
diff --git a/devops/docker/rhel-7-amd64/Dockerfile b/devops/docker/rhel-7-amd64/Dockerfile
@@ -17,12 +17,16 @@ COPY --from=centos /elfutils*.rpm /elfutils.rpm
 RUN yum-config-manager --enable ubi-7-server-devtools-rpms
 RUN yum install -y --disableplugin=subscription-manager \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
     libtool \
     make \
-    openssl-devel
+    openssl-devel \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/rhel-8-amd64/Dockerfile b/devops/docker/rhel-8-amd64/Dockerfile
@@ -3,6 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi
 
 RUN yum install -y --disableplugin=subscription-manager \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
@@ -13,7 +14,10 @@ RUN yum install -y --disableplugin=subscription-manager \
     ninja-build \
     openssl-devel \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/rhel-9-amd64/Dockerfile b/devops/docker/rhel-9-amd64/Dockerfile
@@ -13,7 +13,10 @@ RUN yum install -y --disableplugin=subscription-manager \
     ninja-build \
     openssl-devel \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/rockylinux-9-amd64/Dockerfile b/devops/docker/rockylinux-9-amd64/Dockerfile
@@ -11,7 +11,10 @@ RUN yum install -y \
     libtool \
     make \
     openssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/sles-15-amd64/Dockerfile b/devops/docker/sles-15-amd64/Dockerfile
@@ -3,6 +3,7 @@ FROM registry.suse.com/bci/bci-base:15.5
 
 RUN zypper install -y \
     autoconf \
+    curl \
     gcc \
     gcc-c++ \
     git \
@@ -11,7 +12,10 @@ RUN zypper install -y \
     libtool \
     make \
     libopenssl-devel \
-    rpm-build
+    rpm-build \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/ubuntu-14.04-amd64/Dockerfile b/devops/docker/ubuntu-14.04-amd64/Dockerfile
@@ -6,7 +6,11 @@ RUN apt-get -y update && apt-get -y install \
     gcc \
     git \
     build-essential \
-    file
+    file \
+    curl \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/ubuntu-18.04-amd64/Dockerfile b/devops/docker/ubuntu-18.04-amd64/Dockerfile
@@ -15,7 +15,10 @@ RUN apt -y update && apt-get -y install \
     wget \
     gcovr \
     jq \
-    bc
+    bc \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/ubuntu-20.04-amd64/Dockerfile b/devops/docker/ubuntu-20.04-amd64/Dockerfile
@@ -18,7 +18,10 @@ RUN apt -y update && apt-get -y install \
     wget \
     gcovr\
     jq \
-    bc
+    bc \
+    tar \
+    unzip \
+    zip
 
 RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb && rm packages-microsoft-prod.deb
diff --git a/devops/docker/ubuntu-22.04-amd64/Dockerfile b/devops/docker/ubuntu-22.04-amd64/Dockerfile
@@ -25,7 +25,10 @@ RUN apt -y update && apt-get -y install \
     libasan8 \
     libubsan1 \
     clang \
-    clang-tools
+    clang-tools \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 
diff --git a/devops/docker/ubuntu-24.04-amd64/Dockerfile b/devops/docker/ubuntu-24.04-amd64/Dockerfile
@@ -23,7 +23,10 @@ RUN apt -y update && apt-get -y install \
     libasan8 \
     libubsan1 \
     clang \
-    clang-tools
+    clang-tools \
+    tar \
+    unzip \
+    zip
 
 WORKDIR /git
 

-Original file line number
+Diff line change
     wget \
     gcovr \
     jq \
 -    bc
 +    bc \
 +    tar \
 +    unzip \
 +    zip
 WORKDIR /git