github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Davanum Srinivas 2017-11-02 14:10:22 -04:00
parent 51033c4dec
commit e378a2a6c3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/debian-hyperkube-base/Dockerfile
View File

@ -14,10 +14,13 @@
FROM BASEIMAGE FROM BASEIMAGE
RUN echo CACHEBUST>/dev/null && clean-install \
bash
# The samba-common, cifs-utils, and nfs-common packages depend on # The samba-common, cifs-utils, and nfs-common packages depend on
# ucf, which itself depends on /bin/bash existing. # ucf, which itself depends on /bin/bash.
# It doesn't seem to actually need bash, however. RUN echo "dash dash/sh boolean false" | debconf-set-selections
RUN ln -s /bin/sh /bin/bash RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
RUN echo CACHEBUST>/dev/null && clean-install \ RUN echo CACHEBUST>/dev/null && clean-install \
ca-certificates \ ca-certificates \

2
build/debian-hyperkube-base/Makefile
View File

@ -19,7 +19,7 @@
REGISTRY?=gcr.io/google-containers REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.7 TAG=0.8
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1