diff --git a/build/debian-hyperkube-base/Dockerfile b/build/debian-hyperkube-base/Dockerfile index a4882d87ba2..52f609ff220 100644 --- a/build/debian-hyperkube-base/Dockerfile +++ b/build/debian-hyperkube-base/Dockerfile @@ -20,20 +20,21 @@ FROM BASEIMAGE RUN ln -s /bin/sh /bin/bash RUN echo CACHEBUST>/dev/null && clean-install \ - iptables \ + ca-certificates \ + ceph-common \ + cifs-utils \ + conntrack \ e2fsprogs \ ebtables \ ethtool \ - kmod \ - ca-certificates \ - conntrack \ - util-linux \ - socat \ git \ - jq \ - nfs-common \ glusterfs-client \ - cifs-utils \ - ceph-common + iptables \ + jq \ + kmod \ + openssh-client \ + nfs-common \ + socat \ + util-linux COPY cni-bin/bin /opt/cni/bin diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 7064cc02bc2..0109224878d 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -19,7 +19,7 @@ REGISTRY?=gcr.io/google-containers IMAGE?=debian-hyperkube-base -TAG=0.5 +TAG=0.6 ARCH?=amd64 CACHEBUST?=1 diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 2a55414eb83..d3d00494712 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -70,10 +70,10 @@ docker_pull( docker_pull( name = "debian-hyperkube-base-amd64", - digest = "sha256:d216b425004fcb6d8047f74e81b30e7ead55f73e73511ca53a329c358786b6c9", + digest = "sha256:10546d592e58d5fdb2e25d79f291b8ac62c8d3a3d83337ad7309cca766dbebce", registry = "gcr.io", repository = "google-containers/debian-hyperkube-base-amd64", - tag = "0.5", # ignored, but kept here for documentation + tag = "0.6", # ignored, but kept here for documentation ) docker_pull( diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index f477653aaf9..5f0e1f138a7 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers ARCH?=amd64 HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube -BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.5 +BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.6 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) all: build