From 8fc297c1f977c18c706a65ce59e2fcb007813b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cruz?= Date: Tue, 10 Oct 2017 10:53:02 +0100 Subject: [PATCH 1/2] Ensure base image includes the modprobe binary --- build/debian-hyperkube-base/Dockerfile | 1 + build/debian-hyperkube-base/Makefile | 2 +- cluster/images/hyperkube/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/debian-hyperkube-base/Dockerfile b/build/debian-hyperkube-base/Dockerfile index 6e93390c0e1..a4882d87ba2 100644 --- a/build/debian-hyperkube-base/Dockerfile +++ b/build/debian-hyperkube-base/Dockerfile @@ -24,6 +24,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \ e2fsprogs \ ebtables \ ethtool \ + kmod \ ca-certificates \ conntrack \ util-linux \ diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index f7b96f8b07e..365d0d8294b 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.3 +TAG=0.4 ARCH?=amd64 CACHEBUST?=1 diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 5f9da307b61..d84e854752b 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.3 +BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.4 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) all: build From 31ca8916d95254e9ab672a6b814e0a6a433b2290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cruz?= Date: Thu, 12 Oct 2017 10:01:13 +0100 Subject: [PATCH 2/2] Updated hash and version of image debian-hyperkube-base-amd64 --- build/root/WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index e66d7c05b70..8907e0317d2 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -64,10 +64,10 @@ docker_pull( docker_pull( name = "debian-hyperkube-base-amd64", - digest = "sha256:e45d35f9f967ef7d49496d1d2e6f9ad378a29012b0c90f78b5d59a254f3135e6", + digest = "sha256:f3a37c4d8700a5ff454d94a2bef7d165d287759cea737a621c20e4aa3891dbbb", registry = "gcr.io", repository = "google-containers/debian-hyperkube-base-amd64", - tag = "0.3", # ignored, but kept here for documentation + tag = "0.4", # ignored, but kept here for documentation ) docker_pull(