From f879a05b7fa45decfa1df3e11527fefe15a9cace Mon Sep 17 00:00:00 2001 From: LongYinan Date: Tue, 14 Jun 2022 06:35:22 +0000 Subject: [PATCH] ci: fix docker images --- alpine.Dockerfile | 13 +++---------- debian-aarch64.Dockerfile | 2 +- debian.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 23f77af6..924fa21a 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -6,24 +6,17 @@ 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 wget musl-dev && \ +RUN apk add --update --no-cache bash wget musl-dev clang llvm build-base python3 && \ sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories && \ - apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + apk add --update --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \ rustup \ - build-base \ - bash \ - python3 \ - python2 \ git \ - clang \ - cmake \ - llvm \ gn \ tar \ ninja RUN rustup-init -y && \ - yarn global add pnpm && \ + yarn global add pnpm lerna && \ rustup target add aarch64-unknown-linux-musl && \ wget https://musl.cc/aarch64-linux-musl-cross.tgz && \ tar -xvf aarch64-linux-musl-cross.tgz && \ diff --git a/debian-aarch64.Dockerfile b/debian-aarch64.Dockerfile index 60607f27..79cce6bc 100644 --- a/debian-aarch64.Dockerfile +++ b/debian-aarch64.Dockerfile @@ -11,7 +11,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN apt-get update && \ apt-get install -y --fix-missing --no-install-recommends gpg-agent ca-certificates openssl && \ - wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \ echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ diff --git a/debian.Dockerfile b/debian.Dockerfile index c9ceb677..f1087bfb 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -13,7 +13,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN apt-get update && \ apt-get install -y --fix-missing --no-install-recommends gpg-agent ca-certificates openssl && \ - wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \ echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \