dockly 2.5.1 → 2.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDA2Y2NkNzhkYzRkNDQ0MzYzY2Q1MDE3ZDBjOTVmNDczMjcyODY4OQ==
+    MGE4OTRkYmEzOTkwYTJlOTVhNDA4MDQxYzA3ODM3NGZlNzFmYWY1Yg==
   data.tar.gz: !binary |-
-    MTkwMTM4MDZmZjFiNmE3ZTczNTU4MjAwYmRhZWQ5OTg4OWE1Zjc0NQ==
+    NGYyNTIzZmU1MmFmYzcxZTk1NzMxZGM4ZDIwNDRkZTQ5YjFiOTZhYw==
 SHA512:
   metadata.gz: !binary |-
-    MzkwYWFhZTc3OTM1NzAwZDYwMzlhZTFlOGNmODNkYTQ5NzQ2MmRhYTdhYWI5
-    ZjBjZjJlM2MzYjVmNGFjMTMxOWE5YWZmODA3MzdjOWIzMGJmYzE5OWQ2OGY0
-    ZWZmMDUwOWUxMWRmOGIxNGU3ZWUxODFlYTExOWQ0NDgzZjNiYmY=
+    YzRjMDZlZjlkZmNlYzJkZjI5YzJhYTZiMzhjNTU0ODUxMzMzNmIyNGE4NDFi
+    OWU1MjJjZGZiMTlhZTYzYzI5Y2Y0YmI2ZDNkYjk5MGU4M2MwNWI3MTdkMmRj
+    ODcwODE4NDU3YWRlOTZhYTc2YTRiNjhhNmQyZmYyNzI3MjA5ZDI=
   data.tar.gz: !binary |-
-    NTZhOTQ0MWU5MzgwNTdiZDliZDUyNTQ0ZjcwNmUzNjU4NWNmZTcyYmRmMTdh
-    NjU2NGU3OWU0Yzk5ZjAwY2YzZDExYzU4OTQzNmNlNTBlMmVhMTFhYWIwMzgx
-    NTVmMzU2NzE0MGUzNDdlNzhkYTMwMWNmOTBmMDY0ZDdkNzJmNDY=
+    MWMzMGU2Zjg4NWEzMGMzNmQxZDYwNDk5NjVkMTFmNTA4ZjRiMjEyMmQxZGI2
+    M2QwNTg2MzdkMmQ5MGZlZWI3MDE1MjI0ZWYyODEwMThmNjhhZDc3NzIyNzNk
+    NTcyNzE0NDcyZmIyNjgwM2E5MjU4ZTE1MzUwMmJkZGNkYTBlMWY=

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/snippets/s3_diff_docker_import.erb

@@ -38,7 +38,7 @@ remove_bad_imports() {
   log "removing bad imports"
   images=$(docker images | grep \<none | awk '{ print $3 }')
   if [[ "x$images" != "x" ]]; then
-    docker rmi $images
+    docker rmi $images > >(log)
   fi
   log "bad import removed"
 }
@@ -54,8 +54,7 @@ log "fetch: successfully pulled base image"
 worked=1
 for attempt in {1..200}; do
   [[ $worked != 0 ]] || break
-  stream_image | docker_import && worked=0 || (log "fetch: attempt $attempt failed, sleeping 30"; sleep 30)
-  [[ $worked != 0 ]] && remove_bad_imports
+  stream_image | docker_import && worked=0 || (remove_bad_imports; log "fetch: attempt $attempt failed, sleeping 30"; sleep 30)
 done
 [[ $worked != 0 ]] && fatal "fetch: failed to import diff image"
 log "fetch: successfully imported diff image"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Swipely, Inc.