dockly 3.0.4 → 3.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhhMjA1MzAwZGY2ZmVkYzJiYjUxZjk3ZmM1MDM0OTI2MWY5NGJlMA==
+    MzY4MzVhN2RiNzU5NWE1ODk1OGExNDZkZTBjNTU1YWRmYTkzMTU5Mg==
   data.tar.gz: !binary |-
-    YjU3NzRlOTE4ZmY3ZDAyOGI0YjI0ZDM4OWY3YTJlZjI2ZGY3ZWFmNg==
+    Mjc4NDA2MjBkNDlmZWFmYjI0NDg1MWY5MjFiYjVkZTk3Zjc3YzhmZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTBjY2M0ODFlNzU5NDlmNTU0M2UwZjgzZmRiODcyMGVjNzJhNGZhZWM2NjA3
-    MDkwNTNiNGVmZTJhMWIwOGJlNTQwZjJiYzkxM2Y5ZTQxYzM2NjBiNmFhMDc5
-    MTIyNjU5NDZlZmVhMmU0NzQ3NGJiYTg5Y2ExZTI4M2Q2ZTc4ZGM=
+    MmZjYjkzNmZiOTE3OTk4YTVjYWVjNzFiNzBiMWU5Y2I1MzYzODNhMWI2ZDE3
+    NTE2MTcyMWMxYmJkMzRiZTNlNzFjZmU4YTM0NGJiYjkwNDRkNmI2OTYxOWI1
+    OWQwOTVhNTFhM2VkMzNiZTVlZmQ4MWRjOTExYzE0MjY1M2IwOWU=
   data.tar.gz: !binary |-
-    NTgxN2ZjYWYzMjg4YTI1MmE4OGRlODZmZTQ2MTFlZTdhNmVjNWM0MzYyYzE2
-    MDcxMzU3N2U5ZGFhZDUxNjI5NDQ2OTI3YTQxNmE0YmIzZGU1NTNhZmQyYTU2
-    N2I3YTdjZjQyOGRiNTJhZDI2ZGM1MDQ1ZWQxZWNmMmYzOGUyY2Q=
+    YmE0NDhiNTBhYTU3N2RhNzk3NDMyYzExOTVlZjdmYjk3NmNjM2E1OTQ2NTFl
+    MDRlZjQxZDZjOGEyMzk1ODIwZDUyNTdkMTM5NTk3ZjllOTUzM2IzODVkZjY5
+    NWE2ODU5NmIxOTgwYTVlMmZkZTViM2I3N2ZlNzVkYmE3MDJkMTE=

data/lib/dockly/bash_builder.rb

@@ -17,6 +17,7 @@ module Dockly
 
     generate_snippet_for :normalize_for_dockly, []
     generate_snippet_for :get_and_install_deb, [:s3_url, :deb_path]
+    generate_snippet_for :get_and_install_rpm, [:s3_url, :rpm_path]
 
     generate_snippet_for :file_docker_import, [:path, :repo, :tag]
     generate_snippet_for :file_diff_docker_import, [:base_image, :diff_image, :repo, :tag]

data/lib/dockly/rpm.rb

@@ -10,6 +10,15 @@ class Dockly::Rpm < Dockly::Deb
     "#{package_name}_#{version}.#{release}_#{arch}.rpm"
   end
 
+  def startup_script
+    scripts = []
+    bb = Dockly::BashBuilder.new
+    scripts << bb.normalize_for_dockly
+    scripts << bb.get_and_install_rpm(s3_url, "/opt/dockly/#{File.basename(s3_url)}")
+
+    scripts.join("\n")
+  end
+
 private
   def convert_package
     debug "converting to rpm"

data/lib/dockly/version.rb

@@ -1,7 +1,7 @@
 module Dockly
   MAJOR = 3
   MINOR = 0
-  PATCH = 4
+  PATCH = 5
   RELEASE = nil
 
   VERSION = [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')

data/snippets/get_and_install_rpm.erb

@@ -0,0 +1,13 @@
+worked=1
+s3_path="<%= data[:s3_url] %>"
+output_path="<%= data[:rpm_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 ..."
+  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 rpm from S3"
+log "fetch: successfully fetched $s3_path"
+
+yum -y install "<%= data[:rpm_path] %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -259,6 +259,7 @@ files:
 - snippets/file_diff_docker_import.erb
 - snippets/file_docker_import.erb
 - snippets/get_and_install_deb.erb
+- snippets/get_and_install_rpm.erb
 - snippets/get_from_s3.erb
 - snippets/install_package.erb
 - snippets/normalize_for_dockly.erb