Skip to content

Commit

Permalink
cilium, builder: declutter all unused packages in builder
Browse files Browse the repository at this point in the history
It is unnecessary or unclear why they are being installed. Just remove
them so we can start off a clean base where we later document every pkg
addition properly in the git history.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
borkmann authored and aanm committed May 6, 2020
1 parent acaa1d1 commit 5aeea78
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -15,7 +15,7 @@ LABEL cilium-sha=${CILIUM_SHA}
# versions to be built while allowing the new versions to make changes
# that are not backwards compatible.
#
FROM quay.io/cilium/cilium-builder:2020-05-05 as builder
FROM quay.io/cilium/cilium-builder:2020-05-06 as builder
ARG CILIUM_SHA=""
LABEL cilium-sha=${CILIUM_SHA}
LABEL maintainer="maintainer@cilium.io"
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile.builder
Expand Up @@ -28,11 +28,7 @@ RUN apt-get update && \
git \
libc6-dev \
libelf-dev \
make \
rsync \
unzip \
wget \
zip && \
make && \
apt-get purge --auto-remove && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
2 changes: 1 addition & 1 deletion test/docker-compose.yml
Expand Up @@ -15,7 +15,7 @@ services:
command: "etcd -name etcd0 -advertise-client-urls http://0.0.0.0:4002 -listen-client-urls http://0.0.0.0:4002 -initial-cluster-token etcd-cluster-1 -initial-cluster-state new"
privileged: true
base_image:
image: "quay.io/cilium/cilium-builder:2020-04-16"
image: "quay.io/cilium/cilium-builder:2020-05-06"
volumes:
- "./../:/go/src/github.com/cilium/cilium/"
privileged: true
Expand Down

0 comments on commit 5aeea78

Please sign in to comment.