dockly 2.0.1 → 2.0.2

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/snippets/file_diff_docker_import.erb

@@ -1,7 +1,7 @@
 file_diff_docker_import_fn() {
   s3_path="<%= data[:base_image] %>"
   log "fetch: starting to fetch $s3_path"
-  aws s3 cp --quiet $s3_path - 2> >(log)
+  timeout 600 aws s3 cp --quiet $s3_path - 2> >(log)
   log "fetch: successfully fetched $s3_path"
 }
 

data/snippets/get_and_install_deb.erb

@@ -5,7 +5,7 @@ log "fetch: starting to fetch $s3_path"
 for attempt in {1..200}; do
   [[ $worked != 0 ]] || break
   log "fetch: attempt ${attempt} to get $s3_path ..."
-  aws s3 cp --quiet $s3_path $output_path 2> >(log) && worked=0 || (log "fetch: attempt failed, sleeping 30"; sleep 30)
+  timeout 600 aws s3 cp --quiet $s3_path $output_path 2> >(log) && worked=0 || (log "fetch: attempt failed, sleeping 30"; sleep 30)
 done
 [[ $worked != 0 ]] && fatal "fetch: failed to pull deb from S3"
 log "fetch: successfully fetched $s3_path"

data/snippets/get_from_s3.erb

@@ -5,7 +5,7 @@ log "fetch: starting to fetch $s3_path"
 for attempt in {1..200}; do
   [[ $worked != 0 ]] || break
   log "fetch: attempt ${attempt} to get $s3_path ..."
-  aws s3 cp --quiet $s3_path $output_path 2> >(log) && worked=0 || (log "fetch: attempt failed, sleeping 30"; sleep 30)
+  timeout 600 aws s3 cp --quiet $s3_path $output_path 2> >(log) && worked=0 || (log "fetch: attempt failed, sleeping 30"; sleep 30)
 done
 [[ $worked != 0 ]] && fatal "fetch: failed to pull deb from S3"
 log "fetch: successfully fetched $s3_path"

data/snippets/s3_diff_docker_import.erb

@@ -5,14 +5,15 @@ base_image = "/opt/dockly/base_image.tar"
 s3_diff_docker_import_base_fn() {
   s3_path="<%= data[:base_image] %>"
   log "fetch: starting to fetch $s3_path"
-  aws s3 cp --quiet $s3_path - 2> >(log)
+  # TODO: Remove timeout once https://github.com/aws/aws-cli/issues/1178 closes
+  timeout 600 aws s3 cp --quiet $s3_path - 2> >(log)
   log "fetch: successfully fetched $s3_path"
 }
 
 s3_diff_docker_import_diff_fn() {
   s3_path="<%= data[:diff_image] %>"
   log "fetch: starting to fetch $s3_path"
-  aws s3 cp --quiet $s3_path - 2> >(log)
+  timeout 600 aws s3 cp --quiet $s3_path - 2> >(log)
   log "fetch: successfully fetched $s3_path"
 }
 

data/snippets/s3_docker_import.erb

@@ -1,7 +1,7 @@
 s3_docker_import_fn() {
   s3_path="<%= data[:s3_url] %>"
   log "fetch: starting to fetch $s3_path"
-  aws s3 cp --quiet $s3_path - 2> >(log)
+  timeout 600 aws s3 cp --quiet $s3_path - 2> >(log)
   log "fetch: successfully fetched $s3_path"
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp