dockly 1.5.9 → 1.5.10

data/.cane

@@ -1,3 +1,3 @@
 --no-doc
---abc-max 30
+--abc-max 33
 --style-measure 120

data/lib/dockly/bash_builder.rb

@@ -20,6 +20,7 @@ module Dockly
     generate_snippet_for :install_package, [:path]
     generate_snippet_for :get_and_install_deb, [:s3_url, :deb_path]
     generate_snippet_for :docker_import, [:repo, :tag], { :tag => "latest" }
+    generate_snippet_for :docker_tag_latest, [:repo, :tag]
     generate_snippet_for :file_docker_import, [:path, :repo, :tag]
     generate_snippet_for :file_diff_docker_import, [:base_image, :diff_image, :repo, :tag]
     generate_snippet_for :s3_docker_import, [:s3_url, :repo, :tag]

data/lib/dockly/build_cache/docker.rb

@@ -25,25 +25,31 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     ensure_present! :output_dir
     if cache = pull_from_s3(version)
       debug "inserting to #{output_directory}"
-      path = File.expand_path(cache.path)
-      path_parent = File.dirname(path)
-      tar_flags = keep_old_files ? '-xkf' : 'xf'
-      container = ::Docker::Container.create(
-        'Image' => image.id,
-        'Cmd' => ['/bin/bash', '-lc', [
-            "mkdir -p #{File.dirname(output_directory)}",
-            '&&',
-            "tar #{tar_flags} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
-          ].join(' ')
-        ],
-        'Volumes' => {
-          File.join('/', 'host', path_parent) => { path_parent => 'rw' }
-        }
+      container = image.run("mkdir -p #{File.dirname(output_directory)}")
+      image_with_dir = container.tap(&:wait).commit
+      self.image = image_with_dir.insert_local(
+        'localPath' => cache.path,
+        'outputPath' => File.dirname(output_directory)
       )
-      container.start('Binds' => ["#{path_parent}:#{File.join('/', 'host', path_parent)}"])
-      result = container.wait['StatusCode']
-      raise "Got bad status code when copying build cache: #{result}" unless result.zero?
-      self.image = container.commit
+      #path = File.expand_path(cache.path)
+      #path_parent = File.dirname(path)
+      #tar_flags = keep_old_files ? '-xkf' : 'xf'
+      #container = ::Docker::Container.create(
+      #  'Image' => image.id,
+      #  'Cmd' => ['/bin/bash', '-lc', [
+      #      "mkdir -p #{File.dirname(output_directory)}",
+      #      '&&',
+      #      "tar #{tar_flags} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
+      #    ].join(' ')
+      #  ],
+      #  'Volumes' => {
+      #    File.join('/', 'host', path_parent) => { path_parent => 'rw' }
+      #  }
+      #)
+      #container.start('Binds' => ["#{path_parent}:#{File.join('/', 'host', path_parent)}"])
+      #result = container.wait['StatusCode']
+      #raise "Got bad status code when copying build cache: #{result}" unless result.zero?
+      #self.image = container.commit
       debug "inserted cache into #{output_directory}"
       cache.close
     else

data/lib/dockly/cli.rb

@@ -81,15 +81,18 @@ class Dockly::BuildCacheCommand < Dockly::AbstractCommand
   def execute
     Dockly::BuildCache.model = Dockly::BuildCache::Local
     super
-    build_caches = Dockly.docker(docker_name.to_sym).build_cache || []
-    raise "No build cache for #{docker_name}" if build_caches.empty?
+    docker = Dockly.docker(docker_name.to_sym)
+    build_caches = (docker && docker.build_cache) || []
+
+    puts "No build cache for #{docker_name}" if build_caches.empty?
+
     if list?
       build_caches.each_with_index do |build_cache, index|
         puts "#{index + 1}. Hash: #{build_cache.hash_command} Build: #{build_cache.build_command}"
       end
     else
       bcs = if local?
-        convert_bc_to_local_bc(docker_name)
+        convert_bc_to_local_bc(docker)
       else
         build_caches
       end
@@ -107,9 +110,10 @@ class Dockly::Cli < Dockly::AbstractCommand
   subcommand ['build_cache', 'bc'], 'Build Cache commands', Dockly::BuildCacheCommand
 end
 
-def convert_bc_to_local_bc(docker_name)
+def convert_bc_to_local_bc(docker)
+  return [] unless docker
   lbcs = []
-  Dockly.docker(docker_name.to_sym).build_cache.each do |bc|
+  docker.build_cache.each do |bc|
     lbc = Dockly::BuildCache::Local.new! { name bc.name }
     bc.instance_variables.each do |variable|
       lbc.instance_variable_set(variable, bc.instance_variable_get(variable))

data/lib/dockly/deb.rb

@@ -193,6 +193,7 @@ private
           scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag)
         end
       end
+      scripts << bb.docker_tag_latest(docker.repo, docker.tag)
     end
     scripts.join("\n")
   end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.5.9'
+  VERSION = '1.5.10'
 end

data/snippets/docker_tag_latest.erb

@@ -0,0 +1,3 @@
+<% if data[:tag] %>
+docker tag <%= data[:repo] %>:<%= data[:tag] %> <%= data[:repo] %>:latest
+<% end %>

data/spec/dockly/bash_builder_spec.rb

@@ -74,6 +74,22 @@ describe Dockly::BashBuilder do
     end
   end
 
+  describe "#docker_tag_latest" do
+    context "when there is no tag" do
+      it "does not mark a tag" do
+        output = subject.docker_tag_latest("test_repo")
+        expect(output).to_not include("docker tag")
+      end
+    end
+
+    context "when there is a tag" do
+      it "tags the repo:tag as repo:latest" do
+        output = subject.docker_tag_latest("test_repo", "a_tag")
+        expect(output).to include("docker tag test_repo:a_tag test_repo:latest")
+      end
+    end
+  end
+
   describe "#file_docker_import" do
     let(:path) { "/opt/dockly/file.tar.gz" }
     it "cats, gunzips and passes to docker import" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -278,6 +278,7 @@ files:
 - lib/foreman/cli_fix.rb
 - lib/foreman/export/base_fix.rb
 - snippets/docker_import.erb
+- snippets/docker_tag_latest.erb
 - snippets/file_diff_docker_import.erb
 - snippets/file_docker_import.erb
 - snippets/get_and_install_deb.erb