buncker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c771a48ad5d8e26e4e39f719f2794fb1217eb395
-  data.tar.gz: aa6f0de4b943b434373b3b923f9e6077220402fe
+  metadata.gz: edb0ab76169ff8f781ae8d4a12f3709e41ef20dc
+  data.tar.gz: 39945d9f50f70e26ba10759cb5a6a91e3e039997
 SHA512:
-  metadata.gz: 08dc4ca482374699e3f10142ac6074a5efa14046ed25b2bafaef6a0ae1c989604145b91d6462280dd6c8a84b3daf1d80eb3fdd9339f4de344e62469850c241dd
-  data.tar.gz: 3ec0efc7fef9d8271697bc3d071c56fbcd30627b99cc4c5ed0e5228f92d906ffa91694d3f9fde0b1e19a511df8181a1944a88fe6b8f2fd25c8aa68051fbbc999
+  metadata.gz: 3e5f46a878f45073a2ac882df67edae4e7d5146a0560c4ab2a294bb3dd4b8880fd521b199f68c5e42139bbca22bd427a3fb61979e55ec7cb6a5f7b3a4696922a
+  data.tar.gz: b326d9ae0dec35911fd8e310e129c349bbe2398a5ec52e9d76f97d89f5c55b5a136327a4f9dac1caf2a7fa3a9064a29564148dbd686c63f56dc19bccaa998f03

data/NEWS

@@ -0,0 +1,3 @@
+0.0.2
+
+* Fixes for remote docker (eg. boot2docker)

data/bin/buncker

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+$: << File.expand_path('../../lib', __FILE__)
+
+require 'buncker/patches'
+
 require 'docker'
 require 'fileutils'
 require 'pathname'
@@ -7,64 +11,70 @@ require 'pathname'
 name, tag = ARGV
 
 cachedir = Pathname.pwd + '.buncker/cache'
-cidfile = Pathname.pwd + '.buncker/cid'
 
 FileUtils.mkdir_p cachedir
-FileUtils.rm_f cidfile
 
-slugpath = Pathname.pwd + '.buncker/slug'
+build_sh = File.expand_path("../../build/build.sh", __FILE__)
+
+def create_container opts
+  Docker::Container.create opts
+rescue Docker::Error::NotFoundError
+  # try to pull
+  warn "Image #{image = opts['Image']} not found, trying to pull"
+  Docker::Image.create fromImage: image
+  Docker::Container.create opts
+end
 
-archive = `git archive HEAD`;
-builder = Docker::Container.create(
+builder = create_container(
   'Image' => 'conjurinc/buncker:build',
   'Volumes' => {
-    '/app/vendor' => {}
+    '/app/vendor' => {},
   },
   'OpenStdin' => true,
   'StdinOnce' => true,
 )
+builder.start 'Binds' => ["#{cachedir}:/app/vendor"]
 
-builder.start 'Binds' => "#{cachedir}:/app/vendor"
-
-slug = File.open slugpath, 'w'
-
-builder.attach(
-  stdin: StringIO.new(archive),
-  stdout: true,
-  stderr: true,
-  logs: true,
-) do |stream, chunk|
-  case stream
-  when :stdout
-    slug.write chunk
-  else
-    print chunk
-  end
-end;
-
-builder.wait
-builder.remove
-
-slug.close
-
-target = Docker::Container.create(
+target = create_container(
   'Image' => 'conjurinc/buncker',
   'OpenStdin' => true,
   'StdinOnce' => true,
-  'Cmd' => %w(tar xC/)
+  'Cmd' => %w(tar xvC/)
 )
-
 target.start
 
-target.attach(
-  stdin: File.open(slugpath),
-  stdout: true,
-  stderr: true,
-  logs: true,
-) do |stream, chunk|
-  print chunk
+# fork the builder
+open "|-", 'r' do |builder_pipe|
+  if builder_pipe.nil?
+    # in the child
+    builder.attach(
+      stdin: open('| git archive HEAD', 'r'),
+      stdout: true,
+      stderr: true,
+      logs: true,
+    ) do |stream, chunk|
+      case stream
+      when :stdout
+        # push to target
+        $stdout.write chunk
+      else
+        $stderr.print chunk
+      end
+    end;
+    builder.wait
+  else
+    target.attach(
+      stdin: builder_pipe,
+      stdout: true,
+      stderr: true,
+      logs: true,
+    ) do |stream, chunk|
+      print chunk
+    end
+    target.wait
+  end
 end
 
-target.wait
+builder.remove
 target.commit repo: name, tag: tag
 target.remove

data/build/build.sh

@@ -34,7 +34,27 @@ bundle install --deployment --without development test cucumber appliance >&2
 bundle clean >&2
 
 cd /
-tar c app
+tar cv \
+  --exclude 'app/vendor/bundle/ruby/*/build_info' \
+  --exclude 'app/vendor/bundle/ruby/*/cache' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/doc' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/doc-api' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/examples' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/guides' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/java' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/spec' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/test' \
+  --exclude 'app/vendor/bundle/ruby/*/gems/*/tests' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/doc' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/doc-api' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/examples' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/guides' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/java' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/spec' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/test' \
+  --exclude 'app/vendor/bundle/ruby/*/bundler/gems/*/tests' \
+  --exclude '.git' \
+  app
 
 # some echo here is required, otherwise clients break connection prematurely
 echo Slug built successfully. >&2

data/buncker.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "docker-api", "~> 1.17"
+  # freeze version because of the monkey patch
+  spec.add_runtime_dependency "docker-api", "= 1.17"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/buncker/patches.rb

@@ -0,0 +1 @@
+require 'buncker/patches/docker'

data/lib/buncker/patches/docker.rb

@@ -0,0 +1,49 @@
+require 'docker'
+require 'docker/util'
+
+class Docker::Container
+  # the original doesn't work with SSL sockets
+  # due to inability to close just one half of them
+  #
+  # work around that by opening a separate connection for stdin
+
+  alias_method :orig_attach, :attach
+
+  def attach(options = {}, &block)
+    if (stdin = options.delete(:stdin))
+      stdin_thread = stream_stdin stdin
+    end
+
+    orig_attach options, &block
+    stdin_thread.join
+  end
+
+  private
+
+    # clones a connection and launches a thread to stream stdin
+  def stream_stdin stdin
+    conn = Docker::Connection.new connection.url, connection.options
+
+    Thread.new do
+      conn.post(
+        path_for(:attach),
+        { stream: true, stdout: false, stderr: false, stdin: true },
+        hijack_block: Docker::Util.hijack_stdin_for(stdin)
+      )
+    end
+  end
+end
+
+module Docker::Util
+  module_function
+
+  # hijack only for stdin (to work with SSL sockets)
+  def hijack_stdin_for(stdin)
+    lambda do |socket|
+      debug "hijack_stdin: copying stdin => socket"
+      IO.copy_stream stdin, socket
+      debug "hijack_stdin: closing hijacked write socket"
+      socket.close
+    end
+  end
+end

data/lib/buncker/version.rb

@@ -1,3 +1,3 @@
 module Buncker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: buncker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rafał Rzepecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -64,6 +64,7 @@ files:
 - Gemfile
 - LICENSE
 - Makefile
+- NEWS
 - README.md
 - Rakefile
 - app/Dockerfile
@@ -74,6 +75,8 @@ files:
 - build/build.sh
 - buncker.gemspec
 - lib/buncker.rb
+- lib/buncker/patches.rb
+- lib/buncker/patches/docker.rb
 - lib/buncker/version.rb
 homepage: https://github.com/conjurinc/buncker
 licenses: