From 872a3ff7a77880dd9914287861ae0042fd0704e2 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Wed, 20 Sep 2017 11:05:59 -0500 Subject: [PATCH 1/2] restore e2fsprogs in hyperkube image Fixes #52789 Fixes #50802 --- build/debian-hyperkube-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/debian-hyperkube-base/Dockerfile b/build/debian-hyperkube-base/Dockerfile index 94e00bca160..6e93390c0e1 100644 --- a/build/debian-hyperkube-base/Dockerfile +++ b/build/debian-hyperkube-base/Dockerfile @@ -21,6 +21,7 @@ RUN ln -s /bin/sh /bin/bash RUN echo CACHEBUST>/dev/null && clean-install \ iptables \ + e2fsprogs \ ebtables \ ethtool \ ca-certificates \ From 7d979dd3d937cfcb382eb31fecba1c3095860cd0 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Wed, 20 Sep 2017 12:58:29 -0500 Subject: [PATCH 2/2] bump tags --- build/debian-hyperkube-base/Makefile | 2 +- cluster/images/hyperkube/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 19468078937..f7b96f8b07e 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.2 +TAG=0.3 ARCH?=amd64 CACHEBUST?=1 diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 6d224bc465d..5f9da307b61 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.2 +BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.3 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) all: build