dockly 1.12.1 → 1.12.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU2MGUwNzNkMDZkNDNkODFlMTU0YzBkNTk3ZDZjNzljNDYyYWY2ZA==
+    ZDQ4ZjU0NTExNTliNGE5NDM0NTgzMjg1YWYyM2EzMTc3NTExYTVmOQ==
   data.tar.gz: !binary |-
-    M2M1ZmRjMGIyMzk5Yzk3MDJkNjAwNTk5YTZhM2EwZTI3NWVkODZmZA==
+    MTlhMDhiOTRiMTAwYmJiZTZhNjMyMzdiOGE5ZWVlY2ZjNjA4YmM3MA==
 SHA512:
   metadata.gz: !binary |-
-    MGM2M2NjZDljMzJmNDliZDQ3NGFmNDYyNjIxZGY1NTM3NTJkMmU2Mzk3MWZm
-    NWRjYzhmMjgyMjZiMmZmZmJhNjgyZDdhZjhlOTJlMWEzMDA0OGQ0NzliNDEy
-    ZjZjNjRmYmJhMGZlZTcwNTkwNjBmMjM4OGFmYjc3YzYwOTMwZjM=
+    MGMwYTY4Y2E4OGE5OGJkZjFjNWQyNTk5Y2UzOWYxM2UyZTlhMzU0OTEwYTNh
+    ZDljZjE0ZGZlZTBmZDI5MDE0MjBhODUyNWZmZjBiMzU5YTFiYmY3ZDczMDll
+    ZjFkNDVkYTkwNTE1NjFkYjcyZjQ5YTdlOWI5Y2ZlMTEwNjcxZWY=
   data.tar.gz: !binary |-
-    YTUwNzg1NGVhNWRmYWZjMmE0OWQ0NGIzNGUxNWNkYWNiNDBiMDM2NGNkYTM0
-    N2E4NWMyYjk2NGI5NzQyNjc1ODQ0ODdmMTdmMGVmZjc1MjI2OTIyNmEyOGIx
-    N2EyMjZhZGNiMjNiODkzZThlMzc0MDRjMGRiZjk4NjkyOWQzM2Q=
+    YmQ2ZTFmODgxMzIzNzNlNzBjYzg1MGUyMTAxMDBlNDFjNDFiMjRkNjA2ODgy
+    MDE3YjIxMDVjYTZlODliZmZlNjVjNzJjMTUwZWVlOWYwZjM2MDlhNmYwNDQ5
+    M2M0ZGQwYzI1ODc0ZWNlOWY2YjRjZDJhZWQyNDczYTYzZjI2Nzk=

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.12.1'
+  VERSION = '1.12.2'
 end

data/snippets/s3_diff_docker_import.erb

@@ -37,7 +37,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"
 }
@@ -53,8 +53,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: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Swipely, Inc.