rbld 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d227fefcee50eefa5f3d6bfa353ada39b2ca01af
-  data.tar.gz: 8ac255f0c137b88e4ba6d38d43f3c6dd4d26ff7d
+  metadata.gz: ab06977050419017e9293fc7add885a3474ded72
+  data.tar.gz: 777845489d399990b3942c2d70df0fbf42bd32d3
 SHA512:
-  metadata.gz: c6d267b8044f72f2fa02ab7768eca155bb9555945707858da17e884a76f46c0d32c1243f0774aac6448bcf8824a3b375390241dbfd88f1fdb73234a6a720ebeb
-  data.tar.gz: e124388ec7544bb4c7fe5b5457db4faffa90f6fa4b914c49759b4e60452a59476d6821e1aef2dec22dde51e0e64df088f132c19b1cef996e69103bce7c1c9c15
+  metadata.gz: 36db91de99ee92c41d64b6f1b684edaa539c3e76c1ba0cec9fb91b50af40f074f57f2ff4c148b5ae71f785330412ebbbe1b96f54e1d484ed6508f4ed0950087e
+  data.tar.gz: 066ccf5ce3425c76784e4c2cca7bd90c5030076f106e56969a1444130955197d4341d5d00436969a6551be2ca6024406188ba1faef4ac12cca979a34cf95efde

data/cli/bin/rbld

@@ -29,7 +29,8 @@ begin
 
   exit Rebuild::CLI::Commands.run( ARGV[0], ARGV.drop(1) ) || 0
 
-rescue RuntimeError => msg
-  rbld_print.error(msg)
+rescue StandardError => e
+  rbld_print.error(e.message)
+  e.backtrace.each { |l| rbld_log.fatal(l) }
   exit 1
 end

data/cli/lib/bootstrap/re-build-bootstrap-utils

@@ -32,4 +32,7 @@ delete_user()
 if test "x${REBUILD_TRACE}" = "x1"; then
   set -x
   echo Bootstrap tracing enabled
+  DEBUG_TRACE=/dev/tty
+else
+  DEBUG_TRACE=/dev/null
 fi

data/cli/lib/bootstrap/re-build-entry-point

@@ -22,13 +22,13 @@ setup_users()
 
   if has_app useradd; then
 
-    groupadd -o -g $REBUILD_GROUP_ID $REBUILD_GROUP_NAME
+    groupadd -o -g $REBUILD_GROUP_ID $REBUILD_GROUP_NAME 2>$DEBUG_TRACE
 
     useradd -o -M                          \
             -g $REBUILD_GROUP_ID           \
             -u $REBUILD_USER_ID            \
             --home-dir $REBUILD_USER_HOME  \
-            $REBUILD_USER_NAME
+            $REBUILD_USER_NAME 2>$DEBUG_TRACE
 
   else
 
@@ -70,6 +70,10 @@ fi
 
 RC=$?
 
+if test -z "$*"; then
+rebuild_banner ""
+fi
+
 rebuild_banner "<<< rebuild env $HOSTNAME"
 
 exit $RC

data/cli/lib/data/version

@@ -1 +1 @@
-1.1.0
+1.2.0

data/cli/lib/rbld_dockerops.rb

@@ -0,0 +1,133 @@
+require 'docker_registry2'
+require_relative 'rbld_log'
+require_relative 'rbld_utils'
+require 'fancy_gets'
+
+module Rebuild
+  module Registry
+  module Docker
+    extend Rebuild::Utils::Errors
+
+    rebuild_errors \
+      RegistryOperationError: nil,
+      RegistryNotAuthenticatedError: nil
+
+    class EnvironmentImage
+      include FancyGets
+
+      def initialize(api_module = ::Docker)
+        @api_module = api_module
+      end
+
+      def publish(img, target_url)
+        try_with_login { try_publish( img, target_url ) }
+      end
+
+      def deploy(source_url)
+        try_with_login do
+          try_deploy( source_url ) { |img| yield img }
+        end
+      end
+
+      private
+
+      def try_with_login
+        begin
+          yield
+        rescue RegistryNotAuthenticatedError
+          do_login
+          yield
+        end
+      end
+
+      def get_credential(name, is_secret = false)
+        print "#{name}: "
+        predefined = ENV["RBLD_CREDENTIAL_#{name.upcase}"]
+        if predefined
+          puts "<environment>"
+          predefined
+        else
+          is_secret ? gets_password : STDIN.gets.chomp
+        end
+      end
+
+      def get_secret_credential(name)
+        get_credential( name, true )
+      end
+
+      def do_login
+        puts
+        puts "Login required"
+        puts
+        user = get_credential('Username')
+        email = get_credential('Email')
+        pwd = get_secret_credential('Password')
+        @api_module.creds = { 'username' => user,
+                              'password' => pwd,
+                              'email' => email }
+      end
+
+      def try_publish(img, target_url)
+        api_obj = img.api_obj
+        api_obj.tag( repo: target_url.repo, tag: target_url.tag )
+
+        begin
+          rbld_log.info( "Pushing #{target_url.full}" )
+          @last_error = nil
+          api_obj.push(nil, :repo_tag => target_url.full) do |log|
+            process_log( log )
+          end
+          raise_last_error
+        ensure
+          api_obj.remove( :name => target_url.full )
+        end
+      end
+
+      def try_deploy(source_url)
+        begin
+          rbld_log.info( "Pulling #{source_url.full}" )
+          @last_error = nil
+          img = @api_module::Image.create(:fromImage => source_url.full) do |log|
+            process_log( log )
+          end
+          raise_last_error
+          yield img
+        ensure
+          img.remove( :name => source_url.full ) if img
+        end
+      end
+
+      def process_log(log_item)
+        begin
+          json = JSON.parse( log_item )
+        rescue
+        else
+          trace_progress( json['progress'] )
+          save_last_error( json['errorDetail'] )
+        end
+      end
+
+      def trace_progress(line)
+        rbld_print.inplace_trace( line ) if line
+      end
+
+      def save_last_error(line)
+        @last_error = line['message'] if line
+      end
+
+      def raise_last_error
+        case @last_error
+          when nil
+            # No error
+          when /authentication required/, /unauthorized/
+            raise RegistryNotAuthenticatedError, @last_error
+          else
+            raise RegistryOperationError, @last_error
+        end
+
+      end
+
+    end
+  end
+  end
+end

data/cli/lib/rbld_engine.rb

@@ -8,6 +8,7 @@ require_relative 'rbld_config'
 require_relative 'rbld_utils'
 require_relative 'rbld_print'
 require_relative 'rbld_reg_docker'
+require_relative 'rbld_reg_dockerhub'
 require_relative 'rbld_reg_fs'
 require_relative 'rbld_fileops'
 
@@ -270,6 +271,7 @@ module Rebuild::Engine
 
   rebuild_errors \
    UnsupportedDockerService: 'Unsupported docker service: %s',
+   InaccessibleDockerService: 'Unable to reach the docker engine',
    EnvironmentIsModified: 'Environment is modified, commit or checkout first',
    EnvironmentNotKnown: 'Unknown environment %s',
    NoChangesToCommit: 'No changes to commit for %s',
@@ -285,7 +287,7 @@ module Rebuild::Engine
     def self.from_file(file)
       base = %Q{
         FROM scratch
-        ADD #{file} /
+        ADD #{File.basename( file )} /
       }
 
       new( base, file )
@@ -604,12 +606,15 @@ module Rebuild::Engine
     end
 
     def check_connectivity
-      begin
-        @docker_api.validate_version!
+      @docker_api.validate_version!
+
       rescue Docker::Error::VersionError => msg
+        rbld_log.fatal( msg )
         raise UnsupportedDockerService, msg
-      end
-    end
+      rescue => msg
+        rbld_log.fatal( msg )
+        raise InaccessibleDockerService
+  end
 
     def registry
       return @registry if @registry
@@ -617,6 +622,8 @@ module Rebuild::Engine
       case @cfg.remote!.type
       when 'docker'
         reg_module = Rebuild::Registry::Docker
+      when 'dockerhub'
+        reg_module = Rebuild::Registry::DockerHub
       when 'rebuild'
         reg_module = Rebuild::Registry::FS
       else

data/cli/lib/rbld_reg_docker.rb

@@ -1,6 +1,7 @@
 require 'docker_registry2'
 require_relative 'rbld_log'
 require_relative 'rbld_utils'
+require_relative 'rbld_dockerops'
 
 module Rebuild
   module Registry
@@ -36,7 +37,7 @@ module Rebuild
     end
 
     class API
-      def initialize(remote, api_accessor = DockerRegistry)
+      def initialize(remote, api_accessor = DockerRegistry2)
         @remote = remote
         rbld_log.info( "Connecting to registry #{@remote}" )
         begin
@@ -57,32 +58,12 @@ module Rebuild
 
       def publish(name, tag, img)
         url = Entry.new( name, tag, @remote ).url
-        api_obj = img.api_obj
-
-        api_obj.tag( repo: url.repo, tag: url.tag )
-
-        begin
-          rbld_log.info( "Pushing #{url.full}" )
-          api_obj.push(nil, :repo_tag => url.full) do |log|
-            trace_progress( log )
-          end
-        ensure
-          api_obj.remove( :name => url.full )
-        end
+        EnvironmentImage.new.publish( img, url )
       end
 
-      def deploy(name, tag, api_class = ::Docker::Image)
+      def deploy(name, tag, api_module = ::Docker)
         url = Entry.new( name, tag, @remote ).url
-
-        begin
-          rbld_log.info( "Pulling #{url.full}" )
-          img = api_class.create(:fromImage => url.full) do |log|
-            trace_progress( log )
-          end
-          yield img
-        ensure
-          img.remove( :name => url.full ) if img
-        end
+        EnvironmentImage.new(api_module).deploy( url ) { |img| yield img }
       end
 
       private

data/cli/lib/rbld_reg_dockerhub.rb

@@ -0,0 +1,96 @@
+require 'docker_registry'
+require_relative 'rbld_log'
+require_relative 'rbld_utils'
+require_relative 'rbld_dockerops'
+
+module Rebuild
+  module Registry
+  module DockerHub
+    extend Rebuild::Utils::Errors
+
+    rebuild_errors \
+      IndexConnectionError: 'Failed to access registry at %s',
+      InternalNameParsingError: 'Failed to parse internal name'
+
+    class Entry
+      REGISTRY_ENDPOINT = 'docker.io'
+      NAME_PFX = 'rbe-'
+      TAG_PFX = '-rt-'
+      private_constant :NAME_PFX, :TAG_PFX, :REGISTRY_ENDPOINT
+
+      def initialize(name, tag, path = nil)
+        @name, @tag = name, tag
+        @url = Rebuild::Utils::FullImageName.new( "#{REGISTRY_ENDPOINT}/#{path}",
+                                                  "#{NAME_PFX}#{@name}#{TAG_PFX}#{@tag}" ) if path
+      end
+
+      def self.by_internal_name( int_name )
+        m = int_name.match(/^#{NAME_PFX}(.*)#{TAG_PFX}(.*)/)
+        raise InternalNameParsingError, int_name unless m
+        new( *m.captures )
+      end
+
+      def match( name, tag )
+        name, tag = name.to_s, tag.to_s
+        return tag.empty? ? @name.start_with?( name )
+                          : (@name == name && @tag.start_with?( tag ))
+      end
+
+      attr_reader :name, :tag, :url
+    end
+
+    class API
+      INDEX_ENDPOINT = 'index.docker.io'
+      private_constant :INDEX_ENDPOINT
+
+      def initialize(path)
+        @path = path
+        rbld_log.info( "Connecting to DockerHub #{@path}" )
+        begin
+          endpoint = ENV['RBLD_OVERRIDE_INDEX_ENDPOINT'] || INDEX_ENDPOINT
+          @index = DockerRegistry::Registry.new("https://#{endpoint}")
+          @index.ping
+        rescue StandardError
+          raise IndexConnectionError, endpoint
+        end
+      end
+
+      def search(name = nil, tag = nil)
+        rbld_log.info( "Searching for #{name}:#{tag}" )
+
+        repo = @index.search(@path).detect { |e| e.name == @path }
+
+        return [] unless repo
+
+        repo.tags.map do |e|
+          parse_entry( e.name['name'] )
+        end.compact.find_all do |e|
+          e.match( name, tag )
+        end
+      end
+
+      def publish(name, tag, img)
+        url = Entry.new( name, tag, @path ).url
+        Docker::EnvironmentImage.new.publish( img, url )
+      end
+
+      def deploy(name, tag, api_module = ::Docker)
+        url = Entry.new( name, tag, @path ).url
+        Docker::EnvironmentImage.new(api_module).deploy( url ) { |img| yield img }
+      end
+
+      private
+
+      def parse_entry(internal_name)
+        rbld_log.debug( "Parsing internal name '#{internal_name}'" )
+        begin
+          Entry.by_internal_name( internal_name )
+        rescue InternalNameParsingError => msg
+          rbld_log.warn( msg )
+          return nil
+        end
+      end
+    end
+  end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -58,20 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.32.1
+- !ruby/object:Gem::Dependency
+  name: docker_registry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: docker_registry2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +146,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: fancy_gets_ex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -282,11 +316,13 @@ files:
 - cli/lib/data/version
 - cli/lib/rbld_commands.rb
 - cli/lib/rbld_config.rb
+- cli/lib/rbld_dockerops.rb
 - cli/lib/rbld_engine.rb
 - cli/lib/rbld_fileops.rb
 - cli/lib/rbld_log.rb
 - cli/lib/rbld_print.rb
 - cli/lib/rbld_reg_docker.rb
+- cli/lib/rbld_reg_dockerhub.rb
 - cli/lib/rbld_reg_fs.rb
 - cli/lib/rbld_utils.rb
 - cli/lib/rbld_verinfo.rb
@@ -314,5 +350,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: rbld-1.1.0
+summary: rbld-1.2.0
 test_files: []