github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10824 from stefwalter/docker-images-with-repo 

build: Fix docker image lookup for docker 1.6+
pull/6/head
Marek Grabowski 2015-07-27 17:26:26 +02:00
parent 9cccdc98e8 f06474d938
commit 74b78d537d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -272,7 +272,7 @@ function kube::build::docker_image_exists() {
# We cannot just specify the IMAGE here as `docker images` doesn't behave as
# expected. See: https://github.com/docker/docker/issues/8048
"${DOCKER[@]}" images | grep -Eq "^${1}\s+${2}\s+"
"${DOCKER[@]}" images | grep -Eq "^(\S+/)?${1}\s+${2}\s+"
}
# Takes $1 and computes a short has for it. Useful for unique tag generation