Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #53642 #53871

Merged
merged 3 commits into from Oct 26, 2017
Merged

Automated cherry pick of #53642 #53871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2bdaa2
Ensure base image includes the modprobe binary
edevil Oct 10, 2017
ce179e5
Updated hash and version of image debian-hyperkube-base-amd64
edevil Oct 12, 2017
d1de460
Removed unneeded change on WORKSPACE file
edevil Oct 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions build/debian-hyperkube-base/Dockerfile
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
e2fsprogs \
ebtables \
ethtool \
kmod \
ca-certificates \
conntrack \
util-linux \
Expand Down
2 changes: 1 addition & 1 deletion build/debian-hyperkube-base/Makefile
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@

REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base
TAG=0.3
TAG=0.4
ARCH?=amd64
CACHEBUST?=1

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/hyperkube/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down