diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6960f28..4a9f50c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -4,42 +4,42 @@ FROM ubuntu:bionic # install some basic packages -RUN apt-get update && - apt-get install -y --no-install-recommends \ - build-essential \ - curl \ - git \ - python3-dev \ - python3-pip \ - cmake \ - ca-certificates \ - libssl-dev \ - pkg-config \ - gcc \ - g++ \ - clang-8 \ - clang-tools-8 \ - llvm-8 \ - llvm-8-dev \ - libc++-dev \ - libc++abi-dev \ - lld-8 \ - lldb-8 \ - libclang-8-dev \ - libclang-common-8-dev \ - vim \ - apache2 \ - subversion \ - libapache2-mod-svn \ - libsvn-dev \ - binutils-dev \ - build-essential \ - automake \ - libtool \ - strace \ - less \ - libuv1-dev && - rm -rf /var/lib/apt/lists/* +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + build-essential \ + curl \ + git \ + python3-dev \ + python3-pip \ + cmake \ + ca-certificates \ + libssl-dev \ + pkg-config \ + gcc \ + g++ \ + clang-8 \ + clang-tools-8 \ + llvm-8 \ + llvm-8-dev \ + libc++-dev \ + libc++abi-dev \ + lld-8 \ + lldb-8 \ + libclang-8-dev \ + libclang-common-8-dev \ + vim \ + apache2 \ + subversion \ + libapache2-mod-svn \ + libsvn-dev \ + binutils-dev \ + build-essential \ + automake \ + libtool \ + strace \ + less \ + libuv1-dev \ + && rm -rf /var/lib/apt/lists/* # set to use our installed clang version RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 @@ -48,8 +48,8 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm # set LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/usr/local/lib -RUN curl https://sh.rustup.rs -sSf | - sh -s -- --default-toolchain stable -y +RUN curl https://sh.rustup.rs -sSf | \ + sh -s -- --default-toolchain stable -y ENV PATH=/root/.cargo/bin:$PATH RUN rustup component add rustfmt diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64 index 024b2b1..addbf96 100644 --- a/Dockerfile.x86_64 +++ b/Dockerfile.x86_64 @@ -62,4 +62,3 @@ RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wa ENV WASI_SDK=/opt/wasi-sdk ENV PATH=/opt/sledge/bin:$PATH -