Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Dockerfile for build process #128

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Fix Dockerfile for build process #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02a4c23
Fix non-working Dockerfile for build process
Jul 25, 2023
4806572
Refactor Dockerfile: use rust-toolchain file implicitly in the instal…
landabaso Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Dockerfile
View file
Open in desktop
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 \
junderw marked this conversation as resolved.
Show resolved Hide resolved
--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
Loading