docker_maker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0069666cba4ec1d2706115b25f5f646d6b93634c
-  data.tar.gz: 2cc357b064f9e16eebac8be04bfc2293eb8344b6
+  metadata.gz: 32347a333091e175f833aa94bef6f598a8beaa0f
+  data.tar.gz: 7f6bda93c61f6890038ef79e8f36c72df450a6a1
 SHA512:
-  metadata.gz: 72fcc8518ffae90f7249243478f3a87655782905109897061f2579e85ce3ad4c349ff66633e4fb045fc9f7f8d59f45c5e34e5e938af08516eaaf32ed67413c7b
-  data.tar.gz: b5779dc9a8d0018987d245c05124e9405871bae981fe77c18d23ab9f0fe4d8092fd2462ff95aca86408867b570311fb5bf1b51336968a6a026a2b475b8301488
+  metadata.gz: feb6129132248b8ab3ad25cf8c0565e73116c679afd612188712cacb4fa685e04a6fa615a34df2d328a73c4d31b7c444bdc401ac73dbfff537e8f1bf4b9b9aa7
+  data.tar.gz: 9fa65550447fe171f868757bb6113f1d880e32b0098e3782ac96f9a57d754b346cabe5d0ff060ed00e2975b7dda7c2ce308bf914881022462e02cb4077a7dc59

data/README.md

@@ -1,12 +1,10 @@
-# DockerBuilder
-
-TODO: Write a gem description
+# Docker Maker
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'docker_builder'
+    gem 'docker_maker'
 
 And then execute:
 
@@ -14,7 +12,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install docker_builder
+    $ gem install docker_maker
 
 ## Usage
 

data/docker_builder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "docker_maker"
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["Brian McCallister"]
   spec.email         = ["brianm@skife.org"]
   spec.description   = "Library for building docker images"

data/example/Procfile

@@ -0,0 +1 @@
+web:    python -m SimpleHTTPServer $PORT

data/example/make.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "docker/maker"
+
+Docker.make(from: "ubuntu:12.10", to: "brianm/buildy") do |b|
+  b.maintainer "Brian McCallister <brianm@skife.org>"
+  b.env "DEBIAN_FRONTEND" => "noninteractive",
+        "USER" => "xncore",
+        "PORT" => "8000"
+
+  b.bash <<-EOS
+    apt-get update
+    apt-get install -y python python-pip
+    pip install honcho
+  EOS
+
+  b.put "Procfile" => "/Procfile"
+  b.cmd ["/bin/bash", "-c", "honcho start"]
+  b.expose "8000"
+end
+

data/lib/docker/maker.rb

@@ -3,130 +3,146 @@
 require "open3"
 require "json"
 
-class Docker
-  attr_reader :docker, :name
-  
-  def initialize base, name, path="/usr/bin/docker"
-    @docker = path
-    @name = name
-    @ports = []
-    @env = []
+module Docker
 
-    _, s = _exec [docker, "images", "|", "grep", base]
-    unless s
-      msg, s = _exec [docker, "pull", base]      
-      raise msg unless s
+  class Maker
+    attr_reader :docker, :name
+    
+    def initialize base, name, path="/usr/bin/docker"
+      @docker = path
+      @name = name
+      @ports = []
+      @env = []
+      
+      _, s = _exec [docker, "images", "|", "grep", base]
+      unless s
+        msg, s = _exec [docker, "pull", base]      
+        raise msg unless s
+      end
+      @img, s = _exec [docker, "run", "-d", base, "/bin/bash", "-c", "ls"]
+      raise out unless s
+      _commit
     end
-    @img, s = _exec [docker, "run", "-d", base, "/bin/bash", "-c", "ls"]
-    raise out unless s
-    _commit
-  end
-  
-  def _exec args, input=nil
-    puts "#{args.join(" ")}"
-    Open3.popen3(*args) do |sin, sout, serr, wait|
-      if input 
-        while buff = input.read(4096)
-          sin.write buff
+    
+    def _exec args, input=nil
+      puts "#{args.join(" ")}"
+      Open3.popen3(*args) do |sin, sout, serr, wait|
+        if input 
+          while buff = input.read(4096)
+            sin.write buff
+          end
         end
+        sin.close      
+        status = wait.value
+        m = sout.read.strip
+        [m, status.success?]
+      end    
+    end
+    
+    def _commit
+      c = [docker, "commit"]
+      run = {"PortSpecs" => @ports,
+        "Env" => @env}
+      
+      run['Cmd'] = @cmd if @cmd
+      run['User'] = @user if @user
+      if @maint
+        c << "-m"
+        c << @maint
       end
-      sin.close      
-      status = wait.value
-      m = sout.read.strip
-      [m, status.success?]
-    end    
-  end
-  
-  def _commit
-    c = [docker, "commit"]
-    run = {"PortSpecs" => @ports,
-           "Env" => @env}
-
-    run['Cmd'] = @cmd if @cmd
-    run['User'] = @user if @user
-    if @maint
-      c << "-m"
-      c << @maint
+      out, s = _exec [docker, "commit", "-run", JSON.dump(run),  @img, @name]
+      raise "commit failed: #{out}" unless s
     end
-    out, s = _exec [docker, "commit", "-run", JSON.dump(run),  @img, @name]
-    raise "commit failed: #{out}" unless s
-  end
-
-  def _wait
-    out, s = _exec [docker, "wait", @img]
-    raise "commit failed: #{out}" unless s
-  end
-
-  def _bash cmd, input=nil
-    cmd = [docker, "run", "-d", @name, "/bin/bash", "-c", cmd]    
-    @img, s = _exec cmd, input
-    raise @img unless s
-    s
-  end
-
-  def bash cmd
-    _bash cmd
-    _wait
-    _commit
-  end 
-
-  def cmd c
-    @cmd = Array(c)
-    _commit    
-  end
-
-  def maintainer mnt
-    @maint = mnt
-    _commit
-  end
-
-  def expose port
-    puts "exposing #{port}"
-    @ports << port
-    _commit
-  end
-
-  def user usr
-    @user = usr
-  end
-
-  def env hash
-    @env = @env + hash.inject([]) {|a, (k, v)| a << "#{k}=#{v}"}
-    _commit
-  end
-
-  # IMG=$(docker run -i -a stdin brianm/ruby /bin/bash -c "/bin/cat >
-  # /echo.rb" < ./echo.rb)
-  def put vals
-    vals.each do |k, v|
-      if File.directory? k
-        # mkdir foo; bsdtar -cf - -C adir . | (bsdtar xpf - -C foo )
-        open("|tar -cf - -C #{k} .") do |input|
-          bash "mkdir -p #{v}"
-          cmd = [docker, "run", "-i","-a", "stdin", @name, 
-                 "/bin/bash", "-c", "tar xpf - -C #{v}"]
-          @img, s = _exec cmd, input
-          raise @img unless s
-          _wait
-          _commit
-        end
-      else    
-        File.open(k, "r") do |input|
-          cmd = [docker, "run", "-i","-a", "stdin", @name, 
-                 "/bin/bash", "-c", "/bin/cat >  #{v}"]
-          @img, s = _exec cmd, input
-          raise @img unless s
-          _wait
-          _commit
+    
+    def _wait
+      out, s = _exec [docker, "wait", @img]
+      raise "commit failed: #{out}" unless s
+    end
+    
+    def _bash cmd, input=nil
+      cmd = [docker, "run", "-d", @name, "/bin/bash", "-c", cmd]    
+      @img, s = _exec cmd, input
+      raise @img unless s
+      s
+    end
+    
+    def bash cmd
+      _bash cmd
+      _wait
+      _commit
+    end 
+    
+    def cmd c
+      @cmd = Array(c)
+      _commit    
+    end
+    
+    def maintainer mnt
+      @maint = mnt
+      _commit
+    end
+    
+    def expose port
+      puts "exposing #{port}"
+      @ports << port
+      _commit
+    end
+    
+    def user usr
+      @user = usr
+    end
+    
+    def env hash
+      @env = @env + hash.inject([]) {|a, (k, v)| a << "#{k}=#{v}"}
+      _commit
+    end
+    
+    # IMG=$(docker run -i -a stdin brianm/ruby /bin/bash -c "/bin/cat >
+    # /echo.rb" < ./echo.rb)
+    def put vals
+      vals.each do |k, v|
+        if File.directory? k
+          # mkdir foo; bsdtar -cf - -C adir . | (bsdtar xpf - -C foo )
+          open("|tar -cf - -C #{k} .") do |input|
+            bash "mkdir -p #{v}"
+            cmd = [docker, "run", "-i","-a", "stdin", @name, 
+                   "/bin/bash", "-c", "tar xpf - -C #{v}"]
+            @img, s = _exec cmd, input
+            raise @img unless s
+            _wait
+            _commit
+          end
+        else    
+          File.open(k, "r") do |input|
+            cmd = [docker, "run", "-i","-a", "stdin", @name, 
+                   "/bin/bash", "-c", "/bin/cat >  #{v}"]
+            @img, s = _exec cmd, input
+            raise @img unless s
+            _wait
+            _commit
+          end
         end
       end
     end
-  end
+  end 
 
+  
   def self.make(args)
     from = args[:from]
     to = args[:to]
-    d = Docker.new(from, to)
+    d = Maker.new(from, to)
     yield d
   end
+  
+  Image = Struct.new :repo, :tag, :id, :created
+  
+  def self.images path="/usr/bin/docker"
+    `#{path} images | tail -n +2`.split(/\n/).inject([]) do |a, line|
+      repo, tag, id, created = line.split(/\s\s+/)
+      repo = nil if repo == '<none>'
+      tag = nil if tag == '<none>'
+      a << Image.new(repo, tag, id, created)
+    end
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_maker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brian McCallister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,8 @@ files:
 - README.md
 - Rakefile
 - docker_builder.gemspec
+- example/Procfile
+- example/make.rb
 - lib/docker/maker.rb
 homepage: http://github.com/brianm/docker_builder/
 licenses: