first pass of merging in warp (doesn't build)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:latest
|
||||
FROM ubuntu:24.04
|
||||
|
||||
ENV RUSTUP_HOME=/usr/local/rustup
|
||||
ENV CARGO_HOME=/usr/local/cargo
|
||||
@@ -22,7 +22,7 @@ RUN set -eux; \
|
||||
ca-certificates \
|
||||
xvfb
|
||||
|
||||
# Install rustup. It will download the pinned version in our rust-toolchain.toml as needed.
|
||||
# Install rustup. The pinned Rust toolchain is installed below from rust-toolchain.toml.
|
||||
RUN set -eux; \
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal; \
|
||||
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
|
||||
@@ -70,7 +70,10 @@ RUN set -eux; \
|
||||
|
||||
# Ensure the correct Rust toolchain is installed
|
||||
COPY ./rust-toolchain.toml ./setup/rust-toolchain.toml
|
||||
RUN cd ./setup && rustup toolchain install
|
||||
RUN set -eux; \
|
||||
cd ./setup; \
|
||||
rustup toolchain install; \
|
||||
rustup default "$(rustup show active-toolchain | cut -d' ' -f1)"
|
||||
|
||||
# Install all dependencies needed to build, run, and test Warp
|
||||
COPY ./script ./setup/script
|
||||
|
||||
@@ -14,7 +14,7 @@ You'll need to install:
|
||||
|
||||
## Setup
|
||||
|
||||
You'll run all of these commands from the `warp-internal` repository's root directory.
|
||||
You'll run all of these commands from the repository's root directory.
|
||||
|
||||
First, build the docker container image:
|
||||
|
||||
@@ -27,7 +27,7 @@ Next, run the container:
|
||||
|
||||
```
|
||||
# The path to the source code directory that you want to mount in the
|
||||
# container. This can be the `warp-internal` repository or some parent
|
||||
# container. This can be the `warp` repository or some parent
|
||||
# directory of your choice.
|
||||
LOCAL_PATH="/Users/$USER/src"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user