diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 41a76203b2..f61c010c0b 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -13,7 +13,7 @@ FROM amazonlinux:2023 ARG TARGETARCH -RUN yum install -y wget g++ gcc gdb libatomic libstdc++-static git make zip unzip tar which \ +RUN dnf install -y wget g++ gcc gdb libatomic libstdc++-static ninja-build git make zip unzip tar which \ autoconf automake golang python3 python3-pip perl-FindBin texinfo \ pkg-config libuuid-devel libaio perl-IPC-Cmd && \ rm -rf /var/cache/yum/* @@ -23,6 +23,16 @@ RUN pip3 install conan==1.61.0 RUN echo "target arch $TARGETARCH" RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local +RUN mkdir /opt/vcpkg && \ + wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ + rm -rf vcpkg.tar.gz + +ENV VCPKG_FORCE_SYSTEM_BINARIES 1 + +RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg && vcpkg version + +RUN vcpkg install azure-identity-cpp azure-storage-blobs-cpp gtest --only-downloads + RUN mkdir /tmp/ccache && cd /tmp/ccache &&\ wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/h/hiredis-1.0.2-1.el9.`uname -m`.rpm &&\ wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/c/ccache-4.5.1-2.el9.`uname -m`.rpm &&\ diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index c4f498101c..94ef21fa5f 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -13,10 +13,8 @@ FROM ubuntu:focal-20220426 ARG TARGETARCH -RUN if [ "$TARGETARCH" = "arm64" ]; then apt-get update && apt-get install -y ninja-build; fi - RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 \ - g++ gcc gdb gdbserver git make ccache libssl-dev zlib1g-dev zip unzip \ + g++ gcc gdb gdbserver ninja-build git make ccache libssl-dev zlib1g-dev zip unzip \ clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python3 python3-pip \ pkg-config uuid-dev libaio-dev && \ apt-get remove --purge -y && \ @@ -27,6 +25,16 @@ RUN pip3 install conan==1.61.0 RUN echo "target arch $TARGETARCH" RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local +RUN mkdir /opt/vcpkg && \ + wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ + rm -rf vcpkg.tar.gz + +ENV VCPKG_FORCE_SYSTEM_BINARIES 1 + +RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg && vcpkg version + +RUN vcpkg install azure-identity-cpp azure-storage-blobs-cpp gtest + # Install Go ENV GOPATH /go ENV GOROOT /usr/local/go diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index baac722ad1..647a81350c 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -14,7 +14,7 @@ FROM nvidia/cuda:11.8.0-devel-ubuntu20.04 ARG TARGETARCH RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 ninja-build && \ - wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ + wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ apt-get update && apt-get install -y --no-install-recommends \ g++ gcc gfortran git make ccache libssl-dev zlib1g-dev zip unzip \ clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python3 python3-pip \ @@ -24,6 +24,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce RUN pip3 install conan==1.61.0 +RUN mkdir /opt/vcpkg && \ + wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ + rm -rf vcpkg.tar.gz + +ENV VCPKG_FORCE_SYSTEM_BINARIES 1 + +RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg && vcpkg version + +RUN vcpkg install azure-identity-cpp azure-storage-blobs-cpp gtest + # Instal openblas # RUN wget https://github.com/xianyi/OpenBLAS/archive/v0.3.21.tar.gz && \ # tar zxvf v0.3.21.tar.gz && cd OpenBLAS-0.3.21 && \