From 6a372395aa1c4284736f106f6472192987db18a2 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Sun, 27 Mar 2022 00:16:56 +0800 Subject: [PATCH] build: migrate debian image to messense/manylinux2014-cross --- debian.Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debian.Dockerfile b/debian.Dockerfile index 3a2583e0..6f205d01 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-stretch +FROM messense/manylinux2014-cross:x86_64 ARG NASM_VERSION=2.15.05 @@ -6,19 +6,20 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ CC=clang \ - CXX=clang++ + CXX=clang++ \ + CC_x86_64_unknown_linux_gnu=clang \ + CXX_x86_64_unknown_linux_gnu=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-13 main" >> /etc/apt/sources.list && \ - echo "deb-src http://apt.llvm.org/stretch/ llvm-toolchain-stretch-13 main" >> /etc/apt/sources.list && \ - apt-get update && \ + echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" >> /etc/apt/sources.list && \ + echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" >> /etc/apt/sources.list && \ + curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get install -y --fix-missing --no-install-recommends \ curl \ llvm-13 \ clang-13 \ lld-13 \ - libc++-13-dev \ - libc++abi-13-dev \ + nodejs \ xz-utils \ rcs \ git \ @@ -32,7 +33,7 @@ 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 lerna && \ + npm install -g yarn pnpm lerna && \ ln -sf /usr/bin/clang-13 /usr/bin/clang && \ ln -sf /usr/bin/clang++-13 /usr/bin/clang++ && \ ln -sf /usr/bin/lld-13 /usr/bin/lld && \