From 88e091cbb4be189acce7b883b3bdea150efea47b Mon Sep 17 00:00:00 2001 From: luocai Date: Wed, 20 Nov 2024 16:37:34 +0800 Subject: [PATCH] support c++20 for ubuntu2204. --- Dockerfiles/ubuntu2204.dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile index 447bd87..7183195 100644 --- a/Dockerfiles/ubuntu2204.dockerfile +++ b/Dockerfiles/ubuntu2204.dockerfile @@ -8,7 +8,7 @@ ENV WT_VERSION=4.11.1 RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ && sed -i "s@http://.*security.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ && apt update \ - && apt install -y gcc g++ gdb cmake ninja-build pkg-config openssh-server git nano gpg ca-certificates \ + && apt install -y cmake ninja-build pkg-config openssh-server git nano gpg ca-certificates \ wget curl rsync lsb-release ubuntu-keyring gnupg2 bzip2 unzip zsh libssl-dev zlib1g-dev gettext jq htop tini \ && install -m 0755 -d /etc/apt/keyrings \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \ @@ -53,11 +53,7 @@ RUN cd /root \ && apt update \ && apt install -y software-properties-common \ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ - && apt install -y gcc-13 g++-13 \ - && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60 \ - && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 60 \ - && update-alternatives --config gcc \ - && update-alternatives --config g++ \ + && apt install -y gcc-13 g++-13 gdb \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*