From e378a2a6c3a51b2b016165e0c10a3dd01ce99cb0 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 2 Nov 2017 14:10:22 -0400 Subject: [PATCH 1/2] Do not fake /bin/bash, just use the real bash Looks like 0.6, we ended up with dash as the default shell, with /bin/sh as well as /bin/dash ending up invoking dash. We should not change the contract by faking a link to /bin/bash. Let's install the actual bash package and make sure /bin/sh is linked to /bin/bash as well. --- build/debian-hyperkube-base/Dockerfile | 9 ++++++--- build/debian-hyperkube-base/Makefile | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/debian-hyperkube-base/Dockerfile b/build/debian-hyperkube-base/Dockerfile index 52f609ff220..aeb62ce5683 100644 --- a/build/debian-hyperkube-base/Dockerfile +++ b/build/debian-hyperkube-base/Dockerfile @@ -14,10 +14,13 @@ FROM BASEIMAGE +RUN echo CACHEBUST>/dev/null && clean-install \ + bash + # The samba-common, cifs-utils, and nfs-common packages depend on -# ucf, which itself depends on /bin/bash existing. -# It doesn't seem to actually need bash, however. -RUN ln -s /bin/sh /bin/bash +# ucf, which itself depends on /bin/bash. +RUN echo "dash dash/sh boolean false" | debconf-set-selections +RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash RUN echo CACHEBUST>/dev/null && clean-install \ ca-certificates \ diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 19e468a8fe5..54ca29f7e9a 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.7 +TAG=0.8 ARCH?=amd64 CACHEBUST?=1 From f16b00b32131c64a8731ff132bd5163c2301b2f6 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 28 Nov 2017 17:31:00 -0500 Subject: [PATCH 2/2] update build/root/WORKSPACE and cluster/images/hyperkube/Makefile for the new tag --- build/root/WORKSPACE | 4 ++-- cluster/images/hyperkube/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 242e38f13ca..7de0ffaf334 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -88,10 +88,10 @@ docker_pull( docker_pull( name = "debian-hyperkube-base-amd64", - digest = "sha256:1a05a58432254268c31ef5c8d9c21f3d01a40611b14707de6ac2772c0793bd13", + digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b", registry = "gcr.io", repository = "google-containers/debian-hyperkube-base-amd64", - tag = "0.7", # ignored, but kept here for documentation + tag = "0.8", # ignored, but kept here for documentation ) docker_pull( diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 803c1a0c58d..d7a8c7d936b 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.7 +BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.8 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) all: build