Fix 4.0/try/docker-stack dockerfile (#215)

Signed-off-by: Terkwood <38859656+Terkwood@users.noreply.github.com>
This commit is contained in:
Terkwood 2022-02-18 02:21:35 -05:00 committed by GitHub
parent 77da11c85b
commit 8b9d1be831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions

View File

@ -249,12 +249,6 @@ cargo new tikv-example
cd tikv-example
```
{{< warning >}}
You will need to use a `nightly` toolchain that supports the `async`/`await` feature in order to use the TiKV client in the guide below. This is expected to become stable in Rust 1.38.0.
For now, please `echo 'nightly-2019-08-25' > ./rust-toolchain` in the project directory.
{{< /warning >}}
Next, you'll need to add the TiKV client as a dependency in the `Cargo.toml` file:
```toml
@ -303,7 +297,7 @@ Now, because the client needs to be part of the same network (`tikv`) as the PD
FROM ubuntu:latest
# Systemwide setup
RUN apt update
RUN apt install --yes build-essential protobuf-compiler curl cmake golang
RUN DEBIAN_FRONTEND="noninteractive" apt-get install --yes build-essential protobuf-compiler curl cmake golang libssl-dev
# Create the non-root user.
RUN useradd builder -m -b /
@ -311,12 +305,11 @@ USER builder
RUN mkdir -p ~/build/src
# Install Rust
COPY rust-toolchain /builder/build/
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain `cat /builder/build/rust-toolchain` -y
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/builder/.cargo/bin:${PATH}"
# Fetch, then prebuild all deps
COPY Cargo.toml rust-toolchain /builder/build/
COPY Cargo.toml /builder/build/
RUN echo "fn main() {}" > /builder/build/src/main.rs
WORKDIR /builder/build
RUN cargo fetch