From 59bf55c1fa4746ade14e74ab3e2b991c1e843771 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Mon, 1 Nov 2021 01:28:18 +0800 Subject: [PATCH] chore: switch debian base image to ubuntu:18.04 --- debian.Dockerfile | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/debian.Dockerfile b/debian.Dockerfile index 77739546..9a41f2c7 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-stretch +FROM ubuntu:18.04 ARG NASM_VERSION=2.15.05 @@ -8,28 +8,42 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CC=clang \ 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 && \ - echo "deb-src http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \ +RUN apt-get update && \ + apt-get install curl wget gnupg software-properties-common -y --fix-missing --no-install-recommends && \ + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ + echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main" >> /etc/apt/sources.list && \ + echo "deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main" >> /etc/apt/sources.list && \ + add-apt-repository ppa:ubuntu-toolchain-r/test -y && \ apt-get update && \ apt-get install -y --fix-missing --no-install-recommends \ - llvm \ - clang \ - lld \ + curl \ + gcc-10 \ + g++-10 \ + llvm-13 \ + clang-13 \ + lld-13 \ + xz-utils \ rcs \ + make \ + git \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ gcc-arm-linux-gnueabihf \ g++-arm-linux-gnueabihf \ ninja-build && \ - echo 'deb http://deb.debian.org/debian testing main' >> /etc/apt/sources.list && \ + curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get update && \ - apt-get upgrade -y && \ + apt-get install nodejs -y && \ 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 pnpm + npm install -g pnpm yarn && \ + 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 && \ + ln -sf /usr/bin/gcc-10 /usr/bin/gcc && \ + ln -sf /usr/bin/g++-10 /usr/bin/g++ RUN wget https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz && \ tar -xf nasm-${NASM_VERSION}.tar.xz && \ @@ -43,7 +57,7 @@ RUN wget https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_ RUN git clone --branch release https://github.com/Kitware/CMake.git --depth 1 && \ cd CMake && \ - ./bootstrap && \ + CXX=g++ ./bootstrap && \ make -j 8 && \ make install && \ cd .. && \