[skip ci] Update Dockerfile (#985)

Signed-off-by: Cai Yudong <[email protected]>
zilliztech · Dec 12, 2024 · 91fd937 · 91fd937
1 parent dea48e3
commit 91fd937
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ci/docker/builder/cpu/ubuntu22.04/Dockerfile b/ci/docker/builder/cpu/ubuntu22.04/Dockerfile
@@ -10,11 +10,13 @@ ENV BFLOAT16_WHL="bfloat16-1.4.0-cp311-cp311-linux_x86_64.whl"
 
 RUN apt update \
     && apt install -y ca-certificates apt-transport-https software-properties-common lsb-release \
-    && apt install -y --no-install-recommends wget curl git make gfortran gcc-12 g++-12 swig \
+    && apt install -y --no-install-recommends wget curl git make gfortran gcc g++ swig \
+    && apt install -y gcc-12 g++-12 \
     && apt install -y python3.11 python3.11-dev python3.11-distutils \
     && apt install -y python3-setuptools \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 120 \
+    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 110 \
     && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 120 \
     && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 310 \
     && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 311 \

diff --git a/ci/docker/builder/cpu/ubuntu22.04/arm64/Dockerfile b/ci/docker/builder/cpu/ubuntu22.04/arm64/Dockerfile
@@ -9,11 +9,13 @@ ENV BFLOAT16_WHL="bfloat16-1.4.0-cp311-cp311-linux_aarch64.whl"
 
 RUN apt update \
     && apt install -y ca-certificates apt-transport-https software-properties-common lsb-release \
-    && apt install -y --no-install-recommends wget curl git make gfortran gcc-12 g++-12 swig libssl-dev \
+    && apt install -y --no-install-recommends wget curl git make gfortran gcc g++ swig libssl-dev \
+    && apt install -y gcc-12 g++-12 \
     && apt install -y python3.11 python3.11-dev python3.11-distutils \
     && apt install -y python3-setuptools \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 120 \
+    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 110 \
     && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 120 \
     && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 310 \
     && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 311 \

diff --git a/ci/docker/builder/gpu/ubuntu22.04/Dockerfile b/ci/docker/builder/gpu/ubuntu22.04/Dockerfile
@@ -10,7 +10,8 @@ ENV BFLOAT16_WHL="bfloat16-1.4.0-cp311-cp311-linux_x86_64.whl"
 
 RUN apt update \
     && apt install -y ca-certificates apt-transport-https software-properties-common lsb-release \
-    && apt install -y --no-install-recommends wget curl git make gfortran gcc-12 g++-12 swig \
+    && apt install -y --no-install-recommends wget curl git make gfortran gcc g++ swig \
+    && apt install -y gcc-12 g++-12 \
     && apt install -y python3.11 python3.11-dev python3.11-distutils \
     && apt install -y python3-setuptools \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \