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

Do not fake /bin/bash, just use the real bash #55018

Merged
merged 2 commits into from Nov 29, 2017
Merged

Do not fake /bin/bash, just use the real bash #55018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e378a2a
Do not fake /bin/bash, just use the real bash
dims Nov 2, 2017
f16b00b
update build/root/WORKSPACE and cluster/images/hyperkube/Makefile for…
dims Nov 28, 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
9 changes: 6 additions & 3 deletions build/debian-hyperkube-base/Dockerfile
View file
Open in desktop
Expand Up @@ -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 \
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.7
TAG=0.8
ARCH?=amd64
CACHEBUST?=1

Expand Down
4 changes: 2 additions & 2 deletions build/root/WORKSPACE
View file
Open in desktop
Expand Up @@ -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(
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.7
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.8
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)

all: build
Expand Down