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

Dockerfile: move rust setup to be before pip install #65

Open
wants to merge 1 commit into
base: zeid/bug-1885346-new-lando
Choose a base branch
from
Open

Dockerfile: move rust setup to be before pip install #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions docker/local-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ RUN apt-get update \
vim \
&& rm -rf /var/lib/apt/lists/*

# Install the Rust toolchain. Some packages do not have pre-built wheels (e.g.
# rs-parsepatch) and require this in order to compile.
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y

# Include ~/.cargo/bin in PATH.
# See: rust-lang.org/tools/install (Configuring the PATH environment variable).
ENV PATH="/root/.cargo/bin:${PATH}"


RUN pip install --upgrade pip \
setuptools \
wheel \
Expand All @@ -27,9 +36,7 @@ RUN pip install --upgrade pip \
MozPhab

# Install git-cinnabar
ENV PATH="/root/.cargo/bin:${PATH}"
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& git clone --branch release --single-branch \
RUN git clone --branch release --single-branch \
https://github.com/glandium/git-cinnabar.git /home/phab/git-cinnabar \
&& cd /home/phab/git-cinnabar \
&& make
Expand Down