docker-tests/Dockerfile*: Use --no-install-recommends (#103)

pull/121/head
Manuel Rüger 2021-06-09 20:27:38 +02:00 committed by GitHub
parent 0942452950
commit 6a60643d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 10 deletions

View File

@ -2,21 +2,24 @@
## Builder ## Builder
#################################################################################################### ####################################################################################################
FROM rust:slim as planner FROM rust:slim as planner
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
RUN cargo install cargo-chef RUN cargo install cargo-chef
COPY . . COPY . .
RUN cargo chef prepare --recipe-path recipe.json RUN cargo chef prepare --recipe-path recipe.json
FROM rust:slim as cacher FROM rust:slim as cacher
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
RUN cargo install cargo-chef RUN cargo install cargo-chef
COPY --from=planner /app/recipe.json recipe.json COPY --from=planner /app/recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json RUN cargo chef cook --release --recipe-path recipe.json
FROM rust:slim as builder FROM rust:slim as builder
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
COPY . . COPY . .
@ -27,7 +30,8 @@ RUN strip /app/target/release/innernet
FROM golang:latest as wireguard FROM golang:latest as wireguard
ARG wg_go_tag=0.0.20210323 ARG wg_go_tag=0.0.20210323
ARG wg_tools_tag=v1.0.20210315 ARG wg_tools_tag=v1.0.20210315
RUN apt-get update && apt-get install -y git RUN apt-get update && \
apt-get install -y --no-install-recommends git
RUN git clone -b $wg_go_tag --depth 1 https://git.zx2c4.com/wireguard-go && \ RUN git clone -b $wg_go_tag --depth 1 https://git.zx2c4.com/wireguard-go && \
cd wireguard-go && \ cd wireguard-go && \
@ -45,7 +49,9 @@ RUN git clone -b $wg_tools_tag --depth 1 https://git.zx2c4.com/wireguard-tools &
## Final image ## Final image
#################################################################################################### ####################################################################################################
FROM debian:buster-slim FROM debian:buster-slim
RUN apt-get update && apt-get install -y libsqlite3-dev iproute2 iputils-ping && rm -rf /var/lib/apt/lists/* RUN apt-get update && \
apt-get install -y --no-install-recommends libsqlite3-dev iproute2 iputils-ping && \
rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app

View File

@ -2,21 +2,24 @@
## Builder ## Builder
#################################################################################################### ####################################################################################################
FROM rust:slim as planner FROM rust:slim as planner
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
RUN cargo install cargo-chef RUN cargo install cargo-chef
COPY . . COPY . .
RUN cargo chef prepare --recipe-path recipe.json RUN cargo chef prepare --recipe-path recipe.json
FROM rust:slim as cacher FROM rust:slim as cacher
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
RUN cargo install cargo-chef RUN cargo install cargo-chef
COPY --from=planner /app/recipe.json recipe.json COPY --from=planner /app/recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json RUN cargo chef cook --release --recipe-path recipe.json
FROM rust:slim as builder FROM rust:slim as builder
RUN apt-get update && apt-get install -y build-essential clang libclang-dev libsqlite3-dev RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential clang libclang-dev libsqlite3-dev
WORKDIR /app WORKDIR /app
COPY . . COPY . .
@ -27,7 +30,8 @@ RUN strip /app/target/release/innernet-server
FROM golang:latest as wireguard FROM golang:latest as wireguard
ARG wg_go_tag=0.0.20210323 ARG wg_go_tag=0.0.20210323
ARG wg_tools_tag=v1.0.20210315 ARG wg_tools_tag=v1.0.20210315
RUN apt-get update && apt-get install -y git RUN apt-get update && \
apt-get install -y --no-install-recommends git
RUN git clone -b $wg_go_tag --depth 1 https://git.zx2c4.com/wireguard-go && \ RUN git clone -b $wg_go_tag --depth 1 https://git.zx2c4.com/wireguard-go && \
cd wireguard-go && \ cd wireguard-go && \
@ -45,7 +49,9 @@ RUN git clone -b $wg_tools_tag --depth 1 https://git.zx2c4.com/wireguard-tools &
## Final image ## Final image
#################################################################################################### ####################################################################################################
FROM debian:buster-slim FROM debian:buster-slim
RUN apt-get update && apt-get install -y libsqlite3-dev iproute2 iputils-ping && rm -rf /var/lib/apt/lists/* RUN apt-get update && \
apt-get install -y --no-install-recommends libsqlite3-dev iproute2 iputils-ping && \
rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app
COPY ./docker-tests/start-server.sh ./ COPY ./docker-tests/start-server.sh ./