From 6aeb116eb9744f3a8a7e1d68b1da8da57d197ea2 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sun, 31 Jul 2022 08:49:12 +0000
Subject: [PATCH] ci: tweak changes for Dockerfiles

---
 alpine.Dockerfile         | 4 ++--
 debian-aarch64.Dockerfile | 3 +++
 debian.Dockerfile         | 9 +++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 924fa21a..ef3569ef 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -6,7 +6,7 @@ ENV PATH="/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo
   CXX="clang++" \
   GN_EXE=gn
 
-RUN apk add --update --no-cache bash wget musl-dev clang llvm build-base python3 && \
+RUN apk add --update --no-cache bash wget cmake musl-dev clang llvm build-base python3 && \
   sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories && \
   apk add --update --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \
   rustup \
@@ -18,6 +18,6 @@ RUN apk add --update --no-cache bash wget musl-dev clang llvm build-base python3
 RUN rustup-init -y && \
   yarn global add pnpm lerna && \
   rustup target add aarch64-unknown-linux-musl && \
-  wget https://musl.cc/aarch64-linux-musl-cross.tgz && \
+  wget https://github.com/napi-rs/napi-rs/releases/download/linux-musl-cross%4011.2.1/aarch64-linux-musl-cross.tgz && \
   tar -xvf aarch64-linux-musl-cross.tgz && \
   rm aarch64-linux-musl-cross.tgz
diff --git a/debian-aarch64.Dockerfile b/debian-aarch64.Dockerfile
index 79cce6bc..3207d964 100644
--- a/debian-aarch64.Dockerfile
+++ b/debian-aarch64.Dockerfile
@@ -20,11 +20,14 @@ RUN apt-get update && \
   llvm-14 \
   clang-14 \
   lld-14 \
+  libc++-14-dev \
+  libc++abi-14-dev \
   nodejs \
   xz-utils \
   rcs \
   git \
   make \
+  cmake \
   ninja-build && \
   apt-get autoremove -y && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
diff --git a/debian.Dockerfile b/debian.Dockerfile
index f1087bfb..a47cb9e5 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -22,20 +22,17 @@ RUN apt-get update && \
   llvm-14 \
   clang-14 \
   lld-14 \
+  libc++-14-dev \
+  libc++abi-14-dev \
   nodejs \
   xz-utils \
   rcs \
   git \
   make \
-  gcc-aarch64-linux-gnu \
-  g++-aarch64-linux-gnu \
-  gcc-arm-linux-gnueabihf \
-  g++-arm-linux-gnueabihf \
+  cmake \
   ninja-build && \
   apt-get autoremove -y && \
   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 yarn pnpm lerna && \
   ln -sf /usr/bin/clang-14 /usr/bin/clang && \
   ln -sf /usr/bin/clang++-14 /usr/bin/clang++ && \