ci: tweak changes for Dockerfiles
This commit is contained in:
parent
a9a62f225e
commit
6aeb116eb9
3 changed files with 8 additions and 8 deletions
|
@ -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
|
||||
|
|
|
@ -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 && \
|
||||
|
|
|
@ -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++ && \
|
||||
|
|
Loading…
Reference in a new issue