Skip to content

Commit

Permalink
Merge pull request #128 from bitcoinerlab/update-build-dockerfile
Browse files Browse the repository at this point in the history
Fix Dockerfile for build process
  • Loading branch information
junderw authored Jul 26, 2023
2 parents 94c8e80 + 4806572 commit 8671d1d
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ RUN curl -sSf https://apt.llvm.org/llvm.sh | bash -s -- 12 && \
# Install wasm-opt from binaryen
RUN git clone --depth 1 --branch version_114 https://github.com/WebAssembly/binaryen.git /binaryen && \
cd /binaryen && \
git submodule update --init && \
cmake . && \
make -j$(nproc) && \
make install && \
Expand All @@ -50,11 +51,14 @@ RUN git clone --depth 1 --branch version_114 https://github.com/WebAssembly/bina
RUN useradd -ms /bin/bash builduser
USER builduser

# Install Rust stable
# Install Rust (using ./rust-toolchain version)
WORKDIR /home/builduser/
COPY rust-toolchain .
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \
--default-toolchain stable \
--default-toolchain $(cat rust-toolchain) \
--profile minimal \
--component clippy,rustfmt,rust-src \
--target wasm32-unknown-unknown
--target wasm32-unknown-unknown \
&& rm rust-toolchain

CMD Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & export DISPLAY=':99.0' && bash

0 comments on commit 8671d1d

Please sign in to comment.