Merge #377

377: Avoid pulling if image already exists locally. r=adamgreig a=reitermarkus This avoids overwriting the local image when making changes to images locally. Co-authored-by: Markus Reiter <[email protected]>
cross-rs · Mar 13, 2020 · 47f325a · 47f325a
2 parents 684fed5 + 486499e
commit 47f325a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build-docker-image.sh b/build-docker-image.sh
@@ -10,7 +10,7 @@ run() {
   local image_name="rustembedded/cross:${1}"
   local cache_from_args=
 
-  if docker pull "${image_name}"; then
+  if docker image inspect "${image_name}" &>/dev/null || docker pull "${image_name}"; then
     cache_from_args=(--cache-from "${image_name}")
   fi