From 1b0b075b485c7744fd7c269be6869c9a2e726781 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Tue, 18 Jan 2022 16:48:29 +0800
Subject: [PATCH] build: install lerna in Docker images

---
 alpine.Dockerfile | 2 +-
 debian.Dockerfile | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 8ce3ed57..2457cbc0 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -22,7 +22,7 @@ RUN apk add --update --no-cache wget musl-dev && \
   tar \
   ninja && \
   apk upgrade && \
-  npm install -g pnpm
+  npm install -g pnpm lerna
 
 RUN rustup-init -y && \
   yarn global add pnpm && \
diff --git a/debian.Dockerfile b/debian.Dockerfile
index 7ca00f65..c76a60c3 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -6,8 +6,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
   CARGO_HOME=/usr/local/cargo \
   PATH=/usr/local/cargo/bin:$PATH \
   CC=clang \
-  CXX=clang++ \
-  CXXFLAGS="-stdlib=libc++ -std=c++20 -static"
+  CXX=clang++
 
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
   echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \
@@ -33,9 +32,8 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   rustup target add aarch64-unknown-linux-gnu && \
   rustup target add armv7-unknown-linux-gnueabihf && \
-  npm install -g pnpm && \
-  ln -sf /usr/bin/clang /usr/bin/cc && \
-  echo '[target.x86_64-unknown-linux-gnu]\nrustflags = ["-C", "linker=clang", "-C", "link-arg=-fuse-ld=lld", "-C", "link-arg=-Wl", "-C", "link-arg=-lc++"]' > /usr/local/cargo/config.toml
+  npm install -g pnpm lerna && \
+  ln -sf /usr/bin/clang /usr/bin/cc
 
 RUN wget https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz && \
   tar -xf nasm-${NASM_VERSION}.tar.xz && \