dockly 2.4.0 → 2.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmY4YTk4ZmY0OTU5NzA2ZGM4MWQ4YWUwMjIwOTJkZWI4MDVlY2QyMQ==
+    MzY2ZTM4M2ZiY2QxNmI3MzI3ZTM3YzM1ODVhMTMxZjczMTliMzY2Yg==
   data.tar.gz: !binary |-
-    MmNiMGU5MDQ2ZmU1NmNlZjQ2NGZmMTIwYWEwNzE4OGJiNDE0YzJkNQ==
+    ZmI5YWFiYTY5MjA5NGY5ZjQxMmM0NzQ4NDczOWI2YjZlZjkwYzBmNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTI1Nzg2Njc1MDUzZTMyYmVjMmRmMDVlYmExNDUwMjQ5YWFmZTg4NTQxZDI3
-    NTY2YWU2NjYwMDU1ZTVkZjlhNWUwYzc4NjNiZjM0MDhhMWRmMGRhMWJhYjcw
-    NzZmMWQyYjY1MmMxZTY3ZTZmYjE4NThjOTVlMzVkNjAzZTQxNTM=
+    OWFmZjVjMDU2YzQ3Mzc3OGE5ZjE1NWY2ZGQ1YTVhYjQ5ODc4ODA2ZTc2OGVi
+    ZWU5ODJlMTVjOGM1ZDBjNTIzNTY5YmY1NWZlNmI3ZTJlYjcyYmQzMmM0MDdi
+    YTgzYTc1OThlMjUyMTE4MjAzYmJmOTY5ODdiYTAzNjVlZDg1YWY=
   data.tar.gz: !binary |-
-    MWQ0ZGFmNDg1YjZmMTU2MGQzNmM5NmRiZGI0ODViMTJkN2YwNWIyMzg3MTlj
-    ZGMxMTEwNTNjMWJiMTBmY2UzYmRkOWE1ZjBiY2E0ZDc3OWZmNzA4ZWFjNzYz
-    NWZlYjI1YTY5OWFhZWFjMzY0ZTEwMjRlMjJlNWJhY2E4ODE0MDQ=
+    NTY5MWRjMTNjYWRhY2FiODkyZjNmMTM1ZWZlZGQ1NWVkNTc3ZGVmZWM3ZDNj
+    NmMxYzc0OGIzNmZjYjViOTJhMGZkNjYzNWIwMzhkZjZhODFlMWRiMWQ1ZmM3
+    MTZkOGRkMDgwZjQ0ZGU1NGZmZjU0NjNiOGUwMDdkZGQ0Mzg2ODA=

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/snippets/s3_diff_docker_import.erb

@@ -34,6 +34,12 @@ docker_import() {
   docker import - $repo:$tag > >(log) 2>&1 || fatal "docker failed to import"
 }
 
+remove_bad_imports() {
+  log "removing bad imports"
+  docker images | grep \<none | awk '{ print $3 }' | xargs docker rmi
+  log "bad import removed"
+}
+
 worked=1
 for attempt in {1..200}; do
   [[ $worked != 0 ]] || break
@@ -46,6 +52,7 @@ 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
 done
 [[ $worked != 0 ]] && fatal "fetch: failed to import diff image"
 log "fetch: successfully imported diff image"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp