Skip to content

Commit 03bf26a

Browse files
author
yangxingxiang
committed
Add build.sh surpport Ubuntu 22.04 Docker build, Ubuntu 20.04 Docker build、CentOS 9 Docker build,Default local build
1 parent dfa67aa commit 03bf26a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

dockerfile/dev.ubuntu2004.dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update &&\
66
apt-get install -y --no-install-recommends \
77
git wget ca-certificates software-properties-common \
8-
build-essential meson gcc-10 g++-10 cmake rustc cargo \
8+
build-essential meson cmake rustc cargo \
99
google-perftools \
1010
libaio-dev \
1111
libboost1.71-all-dev \
@@ -27,9 +27,11 @@ RUN apt-get update &&\
2727

2828
RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |tee /etc/apt/trusted.gpg.d/llvm.asc &&\
2929
add-apt-repository -y "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" &&\
30-
apt-get update && apt-get install -y clang-format-14 clang-14 clang-tidy-14 lld-14 libclang-rt-14-dev &&\
30+
apt-get update && apt-get install -y clang-format-14 clang-14 clang-tidy-14 lld-14 libclang-rt-14-dev gcc-10 g++-10 &&\
3131
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100 &&\
3232
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100 &&\
33+
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 &&\
34+
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 &&\
3335
apt-get clean &&\
3436
rm -rf /var/lib/apt/lists/*
3537

0 commit comments

Comments
 (0)