rbld 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e9aca3061e0708713b02db9087e37dc422a6dd
-  data.tar.gz: 95f8378b8a2b3f024c432d3bea4a39843c1b8e7e
+  metadata.gz: 66ed29a4b4b1456efb41da115141609a37fb3f70
+  data.tar.gz: 0937787d9707983d1214f54f5df82a6d829abddb
 SHA512:
-  metadata.gz: c0302f820ffdb0bcd9d058c2ed29b587a8f790c27dfdd6f3977ff74c23105f5af44fbff3b565349d1b572b2885406957e72af3c955473a8141cd9bbc3499cc20
-  data.tar.gz: 6ac9cad20676849bda8176bb96dff285101a9e3a0a154fc2721e934a700bf52c85bc6d65895759691f2fdc6b75d558a5298f1dc93bf79be1ee8122dbb08e0dfe
+  metadata.gz: 61f60ccdcf6a77545281e00a2ac315c7ae6aac5b88cf56df65eb152a16df0ffd5945cbb1f283fa32757f42f97e175266ed9aa007758b9755a3d3de97c19ccb21
+  data.tar.gz: ef7c3c6486866f460968808ca982e60cab407e2278b9d77055e36fb5d962e240ac9da7f3d0e29c88233e237f024349e9a011ce5dac5948d1baa45db05ff0ce94

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

@@ -28,3 +28,8 @@ delete_user()
     exit 1
   fi
 }
+
+if test "x${REBUILD_TRACE}" == "x1"; then
+  set -x
+  echo Bootstrap tracing enabled
+fi

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

@@ -16,9 +16,9 @@ rebuild_banner()
 
 setup_users()
 {
-  delete_user $REBUILD_USER_NAME
-  delete_group $REBUILD_USER_NAME
-  delete_group $REBUILD_GROUP_NAME
+  delete_user $REBUILD_USER_NAME 2>$DEBUG_OUTPUT
+  delete_group $REBUILD_USER_NAME 2>$DEBUG_OUTPUT
+  delete_group $REBUILD_GROUP_NAME 2>$DEBUG_OUTPUT
 
   if has_app useradd; then
 
@@ -52,9 +52,9 @@ sudo_params()
   echo "-n -H -E -g $REBUILD_GROUP_NAME -u $REBUILD_USER_NAME"
 }
 
-setup_users 2>$DEBUG_OUTPUT
+setup_users
 
-cd $REBUILD_PWD
+cd $REBUILD_PWD 2>/dev/null
 
 . /rebuild/rebuild.rc
 

data/cli/lib/rbld_engine.rb

@@ -2,6 +2,7 @@ require 'docker'
 require 'etc'
 require 'thread'
 require 'forwardable'
+require 'os'
 require_relative 'rbld_log'
 require_relative 'rbld_config'
 require_relative 'rbld_utils'
@@ -310,6 +311,7 @@ module Rebuild::Engine
     def with_gzip_writer
       begin
         File.open(@filename, 'w') do |f|
+          f.binmode
           gz = Zlib::GzipWriter.new(f)
           begin
             yield gz
@@ -427,6 +429,45 @@ module Rebuild::Engine
     private_class_method :new
   end
 
+  class RunSettings
+    def initialize
+      @group_name = get_group_name
+      @user_name = Etc.getlogin
+      @home = get_home
+      @pwd = get_pwd
+      @uid = get_uid
+      @gid = get_gid
+    end
+
+    attr_reader :group_name, :home, :pwd, :user_name, :uid, :gid
+
+    private
+
+    def get_group_name
+      if group_info = Etc.getgrgid(Process.gid)
+        group_info[:name]
+      else
+        Etc.getlogin
+      end
+    end
+
+    def get_home
+      OS.windows? ? "/home/#{Etc.getlogin}" : Dir.home
+    end
+
+    def get_pwd
+      Dir.pwd.sub(Dir.home, home)
+    end
+
+    def get_uid
+      OS.windows? ? 1000 : Process.uid
+    end
+
+    def get_gid
+      OS.windows? ? 1000 : Process.gid
+    end
+  end
+
   class API
     extend Forwardable
 
@@ -434,6 +475,7 @@ module Rebuild::Engine
       @docker_api, @cfg = docker_api, cfg
 
       tweak_excon
+      tweak_docker_url
       check_connectivity
       @cache = PresentEnvironments.new
     end
@@ -610,6 +652,12 @@ module Rebuild::Engine
       Excon.defaults[:read_timeout] = 600
     end
 
+    def tweak_docker_url
+      # Default unix pipe does not work with Docker for Windows
+      # Use TCP connection instead
+      Docker.url = 'tcp://127.0.0.1:2375' if OS.windows?
+    end
+
     def check_connectivity
       begin
         @docker_api.validate_version!
@@ -630,19 +678,37 @@ module Rebuild::Engine
       rbld_log.info( "External command returned with code #{@errno}" )
     end
 
+    def run_user_group_name
+      if group_info = Etc.getgrgid(Process.gid)
+        group_info[:name]
+      else
+        Etc.getlogin
+      end
+    end
+
+    def trace_run_settings
+      if ENV['RBLD_BOOTSTRAP_TRACE'] && ENV['RBLD_BOOTSTRAP_TRACE'] == '1'
+        '-e REBUILD_TRACE=1'
+      else
+        ''
+      end
+    end
+
     def run_settings(env, cmd, opts = {})
-       %Q{ -i #{STDIN.tty? ? '-t' : ''}                               \
-           -v #{Dir.home}:#{Dir.home}                                 \
-           -e REBUILD_USER_ID=#{Process.uid}                          \
-           -e REBUILD_GROUP_ID=#{Process.gid}                         \
-           -e REBUILD_USER_NAME=#{Etc.getlogin}                       \
-           -e REBUILD_GROUP_NAME=#{Etc.getgrgid(Process.gid)[:name]}  \
-           -e REBUILD_USER_HOME=#{Dir.home}                           \
-           -e REBUILD_PWD=#{Dir.pwd}                                  \
-           --security-opt label:disable                               \
-           #{opts[:rerun] ? env.rerun_img.id : env.img.id}            \
-           "#{cmd.join(' ')}"                                         \
-       }
+      rs = RunSettings.new
+      %Q{ -i #{STDIN.tty? ? '-t' : ''}                      \
+          -v #{Dir.home}:#{rs.home}                         \
+          -e REBUILD_USER_ID=#{rs.uid}                      \
+          -e REBUILD_GROUP_ID=#{rs.gid}                     \
+          -e REBUILD_USER_NAME=#{rs.user_name}              \
+          -e REBUILD_GROUP_NAME=#{rs.group_name}            \
+          -e REBUILD_USER_HOME=#{rs.home}                   \
+          -e REBUILD_PWD=#{rs.pwd}                          \
+          --security-opt label:disable                      \
+          #{trace_run_settings}                             \
+          #{opts[:rerun] ? env.rerun_img.id : env.img.id}   \
+          "#{cmd.join(' ')}"                                \
+      }
     end
 
     def run_env_disposable(env, cmd)

data/cli/lib/rbld_registry.rb

@@ -62,8 +62,7 @@ module Rebuild
         begin
           rbld_log.info( "Pushing #{url.full}" )
           api_obj.push(nil, :repo_tag => url.full) do |log|
-            progress = JSON.parse(log)["progress"]
-            rbld_print.inplace_trace(progress) if progress
+            trace_progress( log )
           end
         ensure
           api_obj.remove( :name => url.full )
@@ -76,8 +75,7 @@ module Rebuild
         begin
           rbld_log.info( "Pulling #{url.full}" )
           img = api_class.create(:fromImage => url.full) do |log|
-            progress = JSON.parse(log)["progress"]
-            rbld_print.inplace_trace(progress) if progress
+            trace_progress( log )
           end
           yield img
         ensure
@@ -87,6 +85,14 @@ module Rebuild
 
       private
 
+      def trace_progress(log_item)
+        begin
+          line = JSON.parse( log_item )["progress"]
+          rbld_print.inplace_trace( line ) if line
+        rescue
+        end
+      end
+
       def parse_entry(internal_name)
         begin
           Entry.by_internal_name( internal_name )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -112,6 +112,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +309,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: rbld-1.0.0
+summary: rbld-1.0.1
 test_files: []
-has_rdoc: