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

build: Fix docker image lookup for docker 1.6+

Browse Source 
Some versions of docker display image listings like this:

docker.io/golang    1.4                 ebd45caf377c        2 weeks ago

The regular expression used to detect presence of images
needs to be updated. It's unfortunate that we're still
screen-scaping here, due to:

https://github.com/docker/docker/issues/8048
This commit is contained in:
Stef Walter 2015-07-07 14:09:45 +02:00
parent 831827b4bb
commit f06474d938
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 # We cannot just specify the IMAGE here as `docker images` doesn't behave as
# expected. See: https://github.com/docker/docker/issues/8048 # 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 # Takes $1 and computes a short has for it. Useful for unique tag generation