Skip to content

Commit

Permalink
docker-tests/Dockerfile*: Use --no-install-recommends (#103)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrueg authored Jun 9, 2021
1 parent 0942452 commit 6a60643
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
16 changes: 11 additions & 5 deletions docker-tests/Dockerfile.innernet
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
## Builder
####################################################################################################
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
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 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
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 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

COPY . .
Expand All @@ -27,7 +30,8 @@ RUN strip /app/target/release/innernet
FROM golang:latest as wireguard
ARG wg_go_tag=0.0.20210323
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 && \
cd wireguard-go && \
Expand All @@ -45,7 +49,9 @@ RUN git clone -b $wg_tools_tag --depth 1 https://git.zx2c4.com/wireguard-tools &
## Final image
####################################################################################################
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

Expand Down
16 changes: 11 additions & 5 deletions docker-tests/Dockerfile.innernet-server
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
## Builder
####################################################################################################
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
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 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
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 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

COPY . .
Expand All @@ -27,7 +30,8 @@ RUN strip /app/target/release/innernet-server
FROM golang:latest as wireguard
ARG wg_go_tag=0.0.20210323
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 && \
cd wireguard-go && \
Expand All @@ -45,7 +49,9 @@ RUN git clone -b $wg_tools_tag --depth 1 https://git.zx2c4.com/wireguard-tools &
## Final image
####################################################################################################
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

COPY ./docker-tests/start-server.sh ./
Expand Down

0 comments on commit 6a60643

Please sign in to comment.