Skip to content

Commit

Permalink
Remove clang and update ubuntu (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
mosonyi committed Oct 22, 2021
1 parent 1a5cbcf commit dd95ee3
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Intel SGX SDK and PSW installed
# Rust-sgx-sdk installed
# IPFS installed
ARG VERSION_UBUNTU=1804
ARG VERSION_UBUNTU=2004
ARG VERSION_RUST_SGX_SDK=1.1.3

FROM baiduxlab/sgx-rust:${VERSION_UBUNTU}-${VERSION_RUST_SGX_SDK}
Expand Down Expand Up @@ -49,15 +49,15 @@ RUN /root/.cargo/bin/rustup target install wasm32-unknown-unknown

# install packages needed for substrate
RUN apt-get update && \
apt-get install -y cmake pkg-config libssl-dev git gcc build-essential clang libclang-dev && \
apt-get install -y cmake pkg-config libssl-dev git gcc build-essential && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/apt/archives/*

# install LLVM to compile ring into WASM
RUN apt-get update && \
wget https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
sudo ./llvm.sh 10 && \
./llvm.sh 10 && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/apt/archives/*

Expand All @@ -74,5 +74,3 @@ ENV SGX_SDK /opt/sgxsdk
ENV PATH "$PATH:${SGX_SDK}/bin:${SGX_SDK}/bin/x64:/root/.cargo/bin"
ENV PKG_CONFIG_PATH "${PKG_CONFIG_PATH}:${SGX_SDK}/pkgconfig"
ENV LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${SGX_SDK}/sdk_libs"
ENV CC /usr/bin/clang-10
ENV AR /usr/bin/llvm-ar-10

0 comments on commit dd95ee3

Please sign in to comment.