github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25973 from derekwaynecarr/fix_build

Browse Source 
Fix builds on selinux systems
This commit is contained in:
Alex Mohr 2016-05-26 15:47:06 -07:00
commit 2233417673
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/common.sh
View File

@ -312,8 +312,10 @@ function kube::build::clean_output() {
# Make sure the _output directory is created and mountable by docker # Make sure the _output directory is created and mountable by docker
function kube::build::prepare_output() { function kube::build::prepare_output() {
# See auto-creation of host mounts: https://github.com/docker/docker/pull/21666
# if selinux is enabled, docker run -v /foo:/foo:Z will not autocreate the host dir
mkdir -p "${LOCAL_OUTPUT_SUBPATH}" mkdir -p "${LOCAL_OUTPUT_SUBPATH}"
mkdir -p "${LOCAL_OUTPUT_BINPATH}"
# On RHEL/Fedora SELinux is enabled by default and currently breaks docker # On RHEL/Fedora SELinux is enabled by default and currently breaks docker
# volume mounts. We can work around this by explicitly adding a security # volume mounts. We can work around this by explicitly adding a security
# context to the _output directory. # context to the _output directory.
@ -331,7 +333,10 @@ function kube::build::prepare_output() {
number=${#DOCKER_MOUNT_ARGS[@]} number=${#DOCKER_MOUNT_ARGS[@]}
for (( i=0; i<number; i++ )); do for (( i=0; i<number; i++ )); do
if [[ "${DOCKER_MOUNT_ARGS[i]}" =~ "${KUBE_ROOT}" ]]; then if [[ "${DOCKER_MOUNT_ARGS[i]}" =~ "${KUBE_ROOT}" ]]; then
DOCKER_MOUNT_ARGS[i]="${DOCKER_MOUNT_ARGS[i]}:Z" ## Ensure we don't label the argument multiple times
if [[ ! "${DOCKER_MOUNT_ARGS[i]}" == *:Z ]]; then
DOCKER_MOUNT_ARGS[i]="${DOCKER_MOUNT_ARGS[i]}:Z"
fi
fi fi
done done
fi fi