conjur-debify 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddccb9d6f39996c53c34bea3dc5e877271cb0400
-  data.tar.gz: 6378ea97813d23a8f4d5b8f1412749db6fdb52be
+  metadata.gz: f144ac5f47a96820c0c42b1941adee5e51720335
+  data.tar.gz: 4316233ba88c597982eae537cfd9fee00c1d5542
 SHA512:
-  metadata.gz: 33d1e81e5fdf92e94ecfba6faac21967adc69339e204e0982221394c9b6d75a2925ea0ae5df66a472f6db7729be241f64ed97744a93caebb46149e9b61c7b1c6
-  data.tar.gz: 93ca403108dc2b195a9f26006a55de6c7a85470381810236ce32f6bfe64d43098067314b5ab8736e60171e413d74bdb238b7fb154ca4f38ba3d2a155182f3a8f
+  metadata.gz: d13e2010bf0aea5cf5e1285e6444ad7fb8225da92056e18533e3546897f78d91c39f64a8f7123e82a9877f1d744ac675b22dc29f3f58c77ba080bbca1ef21bb3
+  data.tar.gz: 05dcfd9104f647cfc5a0cd6ea9b8e111d975dd01b01c98af0d9f19b80f6cd09b82e85e14e3c198e03fb9218eb0bc6aa890517c35da10006957364a9db00cd3d9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.5.3
+
+* debify now uses `~/.docker/config` auth if pulling an image fails due to auth
+
 # 1.5.2
 
 * Use new conjurops variables in `publish` command, fall back to old conjurops

data/debify.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   
   spec.add_dependency "gli"
-  spec.add_dependency "docker-api"
+  spec.add_dependency "docker-api", "~> 1.33"
   spec.add_dependency "conjur-cli"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.5.2"
+    VERSION = "1.5.3"
   end
 end

data/lib/conjur/debify.rb

@@ -2,6 +2,8 @@ require "conjur/debify/version"
 require 'docker'
 require 'fileutils'
 require 'gli'
+require 'json'
+require 'base64'
 
 include GLI::App
 
@@ -84,6 +86,20 @@ def git_files
   (`git ls-files -z`.split("\x0") + ['Gemfile.lock']).uniq
 end
 
+def login_to_registry(appliance_image_id)
+  config_file = File.expand_path('~/.docker/config.json')
+  if File.exist? config_file
+    json_config = JSON.parse(File.read(config_file))
+    registry = appliance_image_id.split('/')[0]
+
+    json_auth = json_config['auths'][registry]['auth']
+    if json_auth
+      username, password = Base64.decode64(json_auth).split(':')
+      Docker.authenticate! username: username, password: password, serveraddress: registry
+    end
+  end
+end
+
 desc "Clean current working directory of non-Git-managed files"
 long_desc <<DESC
 Reliable builds depend on having a clean working directory.
@@ -341,7 +357,7 @@ command "test" do |c|
     raise "project-name is required" unless project_name = args.shift
     raise "test-script is required" unless test_script = args.shift
     raise "Received extra command-line arguments" if args.shift
-    
+
     dir = cmd_options[:dir] || '.'
     dir = File.expand_path(dir)
     
@@ -355,8 +371,15 @@ command "test" do |c|
       package_name = "conjur-#{project_name}_#{version}_amd64.deb"
         
       raise "#{test_script} does not exist or is not a file" unless File.file?(test_script)
-      
-      Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
+
+      begin
+        tries ||=2
+        Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
+      rescue
+        login_to_registry appliance_image_id
+        retry unless (tries -= 1).zero?
+      end
+
       
       def build_test_image(appliance_image_id, project_name, package_name)
         dockerfile = <<-DOCKERFILE
@@ -384,7 +407,13 @@ RUN touch /etc/service/conjur/down
         end
       end
 
-      appliance_image = build_test_image(appliance_image_id, project_name, package_name)
+      begin
+        tries ||=2
+        appliance_image = build_test_image(appliance_image_id, project_name, package_name)
+      rescue
+        login_to_registry appliance_image_id
+        retry unless (tries -= 1).zero?
+      end
       
       vendor_dir = File.expand_path("tmp/debify/#{project_name}/vendor", ENV['HOME'])
       dot_bundle_dir = File.expand_path("tmp/debify/#{project_name}/.bundle", ENV['HOME'])
@@ -511,7 +540,13 @@ command "sandbox" do |c|
       appliance_image_id = [ cmd_options[:image], image_tag ].join(":")
       
       appliance_image = if cmd_options[:pull]
-        Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
+        begin
+          tries ||=2
+          Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
+        rescue
+          login_to_registry appliance_image_id
+          retry unless (tries -= 1).zero?
+        end
       else
         Docker::Image.get appliance_image_id
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Kevin Gilpin
@@ -28,16 +28,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.33'
 - !ruby/object:Gem::Dependency
   name: conjur-cli
   requirement: !ruby/object:Gem::Requirement