chore: Reduce Dockerfile noise

main
Sean McBride 5 years ago
parent 5f7eb10893
commit 20fb90010a

@ -4,42 +4,42 @@
FROM ubuntu:bionic FROM ubuntu:bionic
# install some basic packages # install some basic packages
RUN apt-get update && RUN apt-get update \
apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
build-essential \ build-essential \
curl \ curl \
git \ git \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
cmake \ cmake \
ca-certificates \ ca-certificates \
libssl-dev \ libssl-dev \
pkg-config \ pkg-config \
gcc \ gcc \
g++ \ g++ \
clang-8 \ clang-8 \
clang-tools-8 \ clang-tools-8 \
llvm-8 \ llvm-8 \
llvm-8-dev \ llvm-8-dev \
libc++-dev \ libc++-dev \
libc++abi-dev \ libc++abi-dev \
lld-8 \ lld-8 \
lldb-8 \ lldb-8 \
libclang-8-dev \ libclang-8-dev \
libclang-common-8-dev \ libclang-common-8-dev \
vim \ vim \
apache2 \ apache2 \
subversion \ subversion \
libapache2-mod-svn \ libapache2-mod-svn \
libsvn-dev \ libsvn-dev \
binutils-dev \ binutils-dev \
build-essential \ build-essential \
automake \ automake \
libtool \ libtool \
strace \ strace \
less \ less \
libuv1-dev && libuv1-dev \
rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# set to use our installed clang version # set to use our installed clang version
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 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 # set LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib ENV LD_LIBRARY_PATH=/usr/local/lib
RUN curl https://sh.rustup.rs -sSf | RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y sh -s -- --default-toolchain stable -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN rustup component add rustfmt RUN rustup component add rustfmt

@ -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 WASI_SDK=/opt/wasi-sdk
ENV PATH=/opt/sledge/bin:$PATH ENV PATH=/opt/sledge/bin:$PATH

Loading…
Cancel
Save