From d56136a89fe45e39169bd5135361369bac9ed058 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Wed, 21 Apr 2021 01:11:20 +0900 Subject: [PATCH] docker-test: minor cleanups --- docker-tests/Dockerfile.innernet | 7 ++++--- docker-tests/Dockerfile.innernet-server | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-tests/Dockerfile.innernet b/docker-tests/Dockerfile.innernet index fb2ad0b..d601a38 100644 --- a/docker-tests/Dockerfile.innernet +++ b/docker-tests/Dockerfile.innernet @@ -2,7 +2,7 @@ ## Builder #################################################################################################### FROM rust as planner -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app RUN cargo install cargo-chef @@ -10,7 +10,7 @@ COPY . . RUN cargo chef prepare --recipe-path recipe.json FROM rust as cacher -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app RUN cargo install cargo-chef @@ -18,12 +18,13 @@ COPY --from=planner /app/recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json FROM rust as builder -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app COPY . . COPY --from=cacher /app/target target RUN cargo build --release --bin innernet +RUN strip /app/target/release/innernet #################################################################################################### ## Final image diff --git a/docker-tests/Dockerfile.innernet-server b/docker-tests/Dockerfile.innernet-server index ca905a6..d581a54 100644 --- a/docker-tests/Dockerfile.innernet-server +++ b/docker-tests/Dockerfile.innernet-server @@ -2,7 +2,7 @@ ## Builder #################################################################################################### FROM rust as planner -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app RUN cargo install cargo-chef @@ -10,7 +10,7 @@ COPY . . RUN cargo chef prepare --recipe-path recipe.json FROM rust as cacher -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app RUN cargo install cargo-chef @@ -18,12 +18,13 @@ COPY --from=planner /app/recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json FROM rust as builder -RUN apt update && apt install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev +RUN apt-get update && apt-get install -y build-essential musl-tools musl-dev clang libclang-dev libsqlite3-dev RUN update-ca-certificates WORKDIR /app COPY . . COPY --from=cacher /app/target target RUN cargo build --release --bin innernet-server +RUN strip /app/target/release/innernet-server #################################################################################################### ## Final image