dockly 1.5.15 → 1.5.16

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.5.15'
+  VERSION = '1.5.16'
 end

data/snippets/get_from_s3.erb

@@ -1,11 +1,11 @@
-log "fetch: starting to fetch deb"
 worked=1
 s3_path="<%= data[:s3_url] %>"
 output_path="<%= data[:output_path] %>"
+log "fetch: starting to fetch $s3_path"
 for attempt in {1..200}; do
   [[ $worked != 0 ]] || break
   log "fetch: attempt ${attempt} to get $s3_path ..."
-  s3cmd -f get $s3_path $output_path && worked=0 || (log "fetch: attempt failed, sleeping 30"; sleep 30)
+  s3cmd -f get $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 deb"
+log "fetch: successfully fetched $s3_path"

data/snippets/s3_diff_docker_import.erb

@@ -5,10 +5,22 @@ base_image = "/opt/dockly/base_image.tar"
 s3_diff_docker_import_base_fn() {
 <%= get_from_s3(data[:base_image]) %>
 }
+
 s3_diff_docker_import_diff_fn() {
 <%= get_from_s3(data[:diff_image]) %>
 }
-s3_diff_docker_import_base_fn | gunzip -c > "<%= base_image %>"
+
+stream_image() {
 size=$(stat --format "%s" "<%= base_image %>")
 head_size=$(($size - 1024))
-(head -c $head_size "<%= base_image %>"; s3_diff_docker_import_diff_fn | gunzip -c) | <%= docker_import(data[:repo], data[:tag]) %>
+head -c $head_size "<%= base_image %>"
+s3_diff_docker_import_diff_fn | (gunzip -vc 2> >(log) || fatal "tardiff failed to gunzip")
+}
+
+docker_import() {
+<%= docker_import(data[:repo], data[:tag]).to_s.strip %> > >(log) 2>&1 || fatal "docker failed to import"
+}
+
+s3_diff_docker_import_base_fn | gunzip -vc > "<%= base_image %>" 2> >(log)
+
+stream_image | docker_import

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.16
   prerelease: 
 platform: ruby
 authors: