From 74eda56cbefe64c8cda9de4d4e7e82fccd4c5d14 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Wed, 15 Sep 2021 22:05:59 +0900 Subject: [PATCH] docker-tests: remove cargo-chef from image (broke build) --- docker-tests/Dockerfile.innernet | 17 ----------------- docker-tests/Dockerfile.innernet-server | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/docker-tests/Dockerfile.innernet b/docker-tests/Dockerfile.innernet index 4616f38..fb8c26b 100644 --- a/docker-tests/Dockerfile.innernet +++ b/docker-tests/Dockerfile.innernet @@ -1,29 +1,12 @@ #################################################################################################### ## Builder #################################################################################################### -FROM rust:slim as planner -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev -WORKDIR /app -RUN cargo install cargo-chef -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM rust:slim as cacher -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev -WORKDIR /app -RUN cargo install cargo-chef -COPY --from=planner /app/recipe.json recipe.json -RUN cargo chef cook --release --recipe-path recipe.json - FROM rust:slim as builder RUN apt-get update && \ apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev WORKDIR /app COPY . . -COPY --from=cacher /app/target target RUN cargo build --release --bin innernet RUN strip /app/target/release/innernet diff --git a/docker-tests/Dockerfile.innernet-server b/docker-tests/Dockerfile.innernet-server index 897d5d6..03520dd 100644 --- a/docker-tests/Dockerfile.innernet-server +++ b/docker-tests/Dockerfile.innernet-server @@ -1,29 +1,12 @@ #################################################################################################### ## Builder #################################################################################################### -FROM rust:slim as planner -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev -WORKDIR /app -RUN cargo install cargo-chef -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM rust:slim as cacher -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev -WORKDIR /app -RUN cargo install cargo-chef -COPY --from=planner /app/recipe.json recipe.json -RUN cargo chef cook --release --recipe-path recipe.json - FROM rust:slim as builder RUN apt-get update && \ apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev WORKDIR /app COPY . . -COPY --from=cacher /app/target target RUN cargo build --release --bin innernet-server RUN strip /app/target/release/innernet-server