diff options
| author | Erik Johnston <erik@matrix.org> | 2022-09-06 19:01:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 19:01:37 +0100 |
| commit | c9b7e9735508bb148c6ad59c433d71e5b8b360ad (patch) | |
| tree | 57ddf5996b62da73f12647f3b537f9843e4e8331 /docker/Dockerfile | |
| parent | Fix trial-olddeps (#13725) (diff) | |
| download | synapse-c9b7e9735508bb148c6ad59c433d71e5b8b360ad.tar.xz | |
Add a stub Rust crate (#12595)
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b87d263cff..a057bf397b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -92,11 +92,20 @@ RUN \ libxml++2.6-dev \ libxslt1-dev \ openssl \ - rustc \ zlib1g-dev \ git \ + curl \ && rm -rf /var/lib/apt/lists/* + +# Install rust and ensure its in the PATH +ENV RUSTUP_HOME=/rust +ENV CARGO_HOME=/cargo +ENV PATH=/cargo/bin:/rust/bin:$PATH +RUN mkdir /rust /cargo + +RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable + # To speed up rebuilds, install all of the dependencies before we copy over # the whole synapse project, so that this layer in the Docker cache can be # used while you develop on the source @@ -108,8 +117,9 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # Copy over the rest of the synapse source code. COPY synapse /synapse/synapse/ +COPY rust /synapse/rust/ # ... and what we need to `pip install`. -COPY pyproject.toml README.rst /synapse/ +COPY pyproject.toml README.rst build_rust.py /synapse/ # Repeat of earlier build argument declaration, as this is a new build stage. ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE |