baha 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E1OWQwZWYyYmQxMzc3NmM1ZjAzZGI3ZTA5NmM3NGQyYTBjZGIyOA==
+    YTUxODZmMWUzYTBhNzI5YTIzZWU0NjAwNzUyMjRiMTMzY2VjNjkyOA==
   data.tar.gz: !binary |-
-    YWJhZDkxNDNhYmNhMmYyMTBiZDNmNzliYTc2YmNmYTk4M2JmYTlmNQ==
+    MzU1Nzg5YjQ3Y2RiNzMwYTIzMmU2ZTQ5ZjQ5ZmVmMDMxNWQ0ZDIwZA==
 SHA512:
   metadata.gz: !binary |-
-    MmVhNjgyMWFmOTJjZGRiYzE0Zjc1ZjdkOTBiZTlkY2YzYzhhMWRkN2I2ODdl
-    MzQ3N2IwMzhkMDQyNDJiZjU4ZjNmYWZkNzU3YjE0OWE3OThjNTkxZjQwMDZl
-    MDA2Zjg2ZTRhZjg2M2MwODZhNGRmMDM1ZjUwYmJhMDA1Y2E1ZGI=
+    NGZiYmFmMTY5ZGRmNDQ1MGJkMzIzMmYyYmIyYjAwZjJkZGY3ZTg5OTExN2Rh
+    NzRkZjY0MDI3NmQ5MTU2NTg1MjUwMmYwN2ZmNjFiY2RlOWEzMDk4NTJlMmI0
+    YjZkMjJlYTJiYTk0ZTk1ODI5M2JmNjMyYzQ3OTczZmQ3YTM5NGM=
   data.tar.gz: !binary |-
-    MTJhOGNiYmYwOGI0YmE5NDI3Y2EwODFiZDU5MzNjYzE4ZmI4NTA0YTlkN2M0
-    ZTgxNmQ5Mzc1ZmZlM2M5NzJiNDg2YjkzYjdmZDlkNjkwYjA5NGUzNzE3YTQz
-    NGVkMTkzYTJhMzgwNGQwMDFjYzNlMWE2YzA1ZjdlZDZjYmJkMTk=
+    YWYzZmFlNjMzMjZkOTgzNjA2N2JhZjNiNTQ4MjRjZTBhNzg1OTFhMzJjZmEw
+    MTg1NjYzZjVkNWUwZWI2ZjUxZDU4ZjM1Yzk2MmQ1ZmM5NTkzZDk4ZTIyNDI0
+    NDY0ZDE3ZTQyZDRiMzhiYjg2MTcyYWM0YTNkM2Y5YmQ3YmZiYzc=

data/.travis.yml

@@ -8,4 +8,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.0
+addons:
+  code_climate:
+    repo_token: 3356d0b9dcd4f188c9ac115df5e27359c336a0db8fb36f79cf8859688d564ac6

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+v0.1.0
+------
+- (#1) Support for creating images from Dockerfiles, similar to [docker-compile.pl](http://3ofcoins.net/2013/09/22/flat-docker-images/)
+- (#2) CLI Command for converting a Dockerfile to an image.yml format
+
+v0.0.1
+------
+Initial Release

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in Baha.gemspec
 gemspec
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -3,12 +3,13 @@ Baha
 
 [![Gem Version](https://badge.fury.io/rb/baha.png)](http://badge.fury.io/rb/baha)
 [![Build Status](https://travis-ci.org/justenwalker/baha.png?branch=master)](https://travis-ci.org/justenwalker/baha)
+[![Code Climate](https://codeclimate.com/github/justenwalker/baha/badges/gpa.svg)](https://codeclimate.com/github/justenwalker/baha)
 
 Introduction
 ------------
 
 Baha is a command-line utility that assists in the creation of docker images.
-It addresses some of `Dockerfile`'s' shortcomings and encourages smaller, reusable, tagged images.
+It addresses some of Dockerfiles shortcomings and encourages smaller, reusable, tagged images.
 
 Why not Dockerfiles?
 --------------------
@@ -18,9 +19,11 @@ Dockerfiles are simple. They are an easy way to make a docker image without need
 So why would I use Baha?
 ------------------------
 
+Baha attempts to address the shortcomings of Dockerfiles by factoring out redundancies and providing a modular interface for creating suites of dependent images.
+
 ### 1. Baha forbids more than 1 layer per image
 
-If you split statements across multiple RUN statements, each of these results in a new layer.
+If you split statements across multiple `RUN` statements, each of these results in a new layer.
 The more commands you run, the more layers you create.  If you want to *minimize the number of layers* (See [Official Recommendations](https://docs.docker.com/articles/dockerfile_best-practices/)) 
 then you must ensure that all statements can be condensed into one line - sacrificing maintainability in the process.
 
@@ -30,25 +33,25 @@ Baha encourages using scripts instead of `RUN` statements to ensure that only on
 
 The nature of the way the dockerfiles are processed means that each command you run commits a new image.
 This means, that if you have a `RUN` statement that downloads packages for installation. 
-This will commit a layer with the installation files.  Later on if you clean up these files with further RUN commands, they will still exist in your image lineage - thus having no space savings. Without proper precautions, you'll end up having unnecessarily large images.
+This will commit a layer with the installation files.  Later on if you clean up these files with further `RUN` commands, they will still exist in your image lineage - thus having no space savings. Without proper precautions, you'll end up having unnecessarily large images.
 
 Baha ensures that all setup tasks happen in a single commit - so you can write cleanup statements and be assured that they will indeed be absent in the resulting images.
 
 ### 3. Baha understands the bigger picture
 
-Another best practice (2, #7) recommends that you use your own base image.
+Another best practice ([2](http://crosbymichael.com/dockerfile-best-practices-take-2.html): #7) recommends that you use your own base image.
 Dockerfiles make it simple to create your own 'base' image, but how about updates?
 
 If you were to just rebuild all of your Dockerfiles, you would create an entirely new tree - even if nothing changed.
 
-Baha will rebuild your entire lineage if the base images changes, but will not rebuild base images if only the children change.
+Baha will rebuild your entire lineage if the base image changes, but will not rebuild base images if only the children change.
 
-**Caveat**: 
+**Caveat**
 
 Baha relies on tagging your releases, noticing when the tag has changed, and treating tags as immutable. 
 This is analogous to how **git** treats tags.
 
-Tagging your images is another best-practice (2, #5) anyway, so this is encouraged by design. 
+Tagging your images is another best-practice ([2](http://crosbymichael.com/dockerfile-best-practices-take-2.html): #5) anyway, so this is encouraged by design. 
 
 Bottom line is: If you change your image, you should change the tag/version.
 
@@ -62,8 +65,8 @@ This workspace is made available to the image via a bind mount during build-time
 
 **References**
 
-1. [Official Dockerfile Best Practices](https://docs.docker.com/articles/dockerfile_best-practices/)<a name="r1"></a>
-2. [Dockerfile Best Practices - take 2, by Michael Crosby](http://crosbymichael.com/dockerfile-best-practices-take-2.html)<a name="r2"></a>
+1. [Official Dockerfile Best Practices](https://docs.docker.com/articles/dockerfile_best-practices/)
+2. [Dockerfile Best Practices - take 2, by Michael Crosby](http://crosbymichael.com/dockerfile-best-practices-take-2.html)
 
 Disclaimer
 ----------
@@ -83,16 +86,16 @@ Installation
 ```
 $ gem install baha
 ```
-### gem install baha
 
 Usage
 -----
 
 ```
 Baha Commands:
-  baha build [options] CONFIG  # Builds all docker images based on the given config
-  baha help [COMMAND]          # Describe available commands or one specific command
-  baha version                 # Print version and exit
+  baha build [options] CONFIG             # Builds all docker images based on the given config
+  baha convert DOCKERFILE n, --name=NAME  # Converts an existing dockerfile to a Baha-compatible image.yml
+  baha help [COMMAND]                     # Describe available commands or one specific command
+  baha version                            # Print version and exit
 ```
 
 **build**
@@ -111,7 +114,50 @@ Description:
   Reads the CONFIG file and builds all of the docker images in the order they appear.
 ```
 
-Check out the `example` directory for a sample CONFIG file.
+**convert**
+
+```
+Usage:
+  baha convert DOCKERFILE n, --name=NAME
+
+Options:
+  n, --name=NAME        # The target image name
+  t, [--tag=TAG]        # The target image tag
+                        # Default: latest
+  o, [--output=OUTPUT]  # Target output file
+                        # Default: STDOUT
+
+Description:
+  Reads the given Dockerfile and outputs a Baha-compatible image.yml 
+  which can be included or embedded within a CONFIG
+```
+
+Example
+-------
+
+Check out the **example** directory for a sample CONFIG.
+
+To run the example build
+
+```
+### 1.
+### If necessary (using boot2docker) export the correct environment variables
+### You can find this by running boot2docker up
+# export DOCKER_HOST=tcp://192.168.59.103:2376
+# export DOCKER_CERT_PATH=$HOME/.boot2docker/certs/boot2docker-vm
+# export DOCKER_TLS_VERIFY=1
+
+### 2.
+### Checkout baha
+git clone https://github.com/justenwalker/baha.git
+cd baha
+
+### 3. Install bundle
+bundle install
+
+### 4. Run the example.yml
+bundle exec baha build -d example/example.yml
+```
 
 How it works
 ------------
@@ -127,13 +173,25 @@ It will build each image in the order they appear by doing the following.
 1. Create the workspace directory if it doesn't exist
 2. Run any `pre_build` tasks to prepare dependencies
 
-### Run the image's `command` inside the image
+### Run the command inside the image
 1. Creates a new container and runs it with the `command` given
 2. Commits the container with the run options specified in the images `config` section.
 
+### Tags the resulting image
+Adds the appropriate tags to the image as defined in the image config for both the remote registry and local repository.
+
 How to Contribute
 -----------------
 
+Contributions are welcome! Documentation, bug-fixes, patches, or new functionality, or comments/criticism.
+
+### Code Contributions
+
+Start by [forking](https://github.com/justenwalker/baha/fork) the github project.
+Work on a topic branch instead of master (`git checkout -b my-feature`) and submit a pull request when you are done.
+
+Please add specs to cover the change so that we can avoid regressions and help future commits from breaking existing code.
+
 ### Running the tests
 
     $ bundle
@@ -146,11 +204,11 @@ How to Contribute
 
 ### Reporting Issues
 
-Please include a reproducible test case.
+Please include a reproducible test case if possible. Otherwise, provide as much detail as you can.
 
 License
 -------
 
 Copyright (c) 2014 Justen Walker.
 
-Released under the terms of the MIT License. For further information, please see the file `LICENSE.md`.
+Released under the terms of the MIT License. For further information, please see the file `LICENSE.md`.

data/baha.gemspec

@@ -8,9 +8,10 @@ Gem::Specification.new do |spec|
   spec.version       = Baha::VERSION
   spec.authors       = ["Justen Walker"]
   spec.email         = ["justen.walker+github@gmail.com"]
-  spec.summary       = %q{Baha - A tool for describing image builds for Docker}
-  spec.description   = %q{Baha - A tool for describing image builds for Docker}
-  spec.homepage      = ""
+  spec.summary       = %q{Baha is a command-line utility that assists in the creation of docker images.}
+  spec.description   = spec.summary + "\n" +
+                       %q{It addresses some of Dockerfiles shortcomings and encourages smaller, reusable, tagged images.}
+  spec.homepage      = "https://github.com/justenwalker/baha"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/example/example.yml

@@ -52,3 +52,8 @@ images:
   ### include them from another file relative to this config. 
   ### Keep things modular and maintainable.
   - include: rvm/image.yml
+  ### You can also build an image from a Dockerfile
+  ### Be sure to name and tag it
+  - dockerfile: memcached/Dockerfile
+    name: memcached
+    tag: 2.2

data/example/memcached/Dockerfile

@@ -0,0 +1,24 @@
+# Memcached
+#
+# VERSION       2.2
+
+# use the ubuntu base image provided by dotCloud
+FROM ubuntu
+
+MAINTAINER Victor Coisne victor.coisne@dotcloud.com
+
+# make sure the package repository is up to date
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
+RUN apt-get update
+
+# install memcached
+RUN apt-get install -y memcached
+
+# Launch memcached when launching the container
+ENTRYPOINT ["memcached"]
+
+# run memcached as the daemon user
+USER daemon
+
+# expose memcached port
+EXPOSE 11211

data/lib/baha/builder.rb

@@ -3,6 +3,8 @@ require 'baha/image'
 require 'baha/log'
 require 'baha/pre_build'
 require 'fileutils'
+require 'tempfile'
+require 'shellwords'
 
 class Baha::Builder
   LOG = Baha::Log.for_name("Builder")
@@ -47,6 +49,27 @@ class Baha::Builder
         FileUtils.mkdir_p workspace.to_s
       end
 
+      run = false
+      ## Image Run Config
+      if image.run
+        build_log.debug { "Image has RUN commands"}
+        run = '.init.sh' 
+        File.open(workspace + run,'w') do |f|
+          f.write("#!/bin/sh\n")
+          f.write("set -xe\n")
+          image.run.each do |cmd|
+            build_log.debug { "Writing command: #{cmd}"}
+            case cmd
+            when String
+              f.write("#{cmd}\n")
+            when Array
+              safe = Shellwords.shelljoin(cmd)
+              f.write("#{safe}\n")
+            end
+          end
+        end
+      end
+
       ## Pre-Build tasks
       build_log.info { "Building #{image.name}" }
       if image.pre_build
@@ -58,16 +81,20 @@ class Baha::Builder
       end
 
       ## Build Image
+      command = image.command
+      if run
+        command = ["/bin/sh", "#{image.bind}/#{run}"]
+      end
       container_config = {
         'Image'       => image.parent_id,
-        'Cmd'         => image.command,
+        'Cmd'         => command,
         'Workingdir'  => image.bind
       }
       build_log.debug { "Creating container for #{image.name} => #{container_config.inspect}" }
       container = Docker::Container.create(container_config)
       build_log.debug { "Created container #{container.id} "}
 
-      build_log.debug { "Running container for #{image.name}" }
+      build_log.debug { "Running container for #{image.name}: #{command}" }
       container.start({
         'Binds' => "#{image.workspace.expand_path}:#{image.bind}"
       })

data/lib/baha/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'baha/builder'
 require 'baha/log'
+require 'baha/dockerfile'
 
 class Baha::CLI < Thor
   desc "build [options] CONFIG", "Builds all docker images based on the given config"
@@ -62,6 +63,58 @@ class Baha::CLI < Thor
       Baha::Log.close!
     end
   end
+  desc "convert DOCKERFILE", "Converts an existing dockerfile to a Baha-compatible image.yml"
+  long_desc <<-LONGDESC
+  Reads the given Dockerfile and outputs a Baha-compatible image.yml which can be included or embedded within a CONFIG
+  LONGDESC
+  option :name, {
+    :aliases => :n,
+    :required => true,
+    :type => :string,
+    :desc => "The target image name"
+  }
+  option :tag, {
+    :aliases => :t,
+    :required => false,
+    :type => :string,
+    :default => 'latest',
+    :desc => 'The target image tag'
+  }
+  option :output, {
+    :aliases => :o,
+    :required => false,
+    :type => :string,
+    :default => 'STDOUT',
+    :desc => 'Target output file'
+  }
+  def convert(dockerfile)
+    file = Pathname.new(dockerfile)
+    out = options[:output]
+    name = options[:name]
+    tag = options[:tag]
+    Baha::Log.logfile = STDERR
+    Baha::Log.level = :info
+    log = Baha::Log.for_name("CLI")
+    begin
+      if file.exist?
+        yaml = Baha::Dockerfile.parse(dockerfile)
+        yaml = { 'name' => name, 'tag' => tag }.merge(yaml)
+        if out == 'STDOUT'
+          puts yaml.to_yaml
+        else
+          File.open(out,'w') do |f|
+            f.write yaml.to_yaml
+          end
+        end
+      else
+          log.fatal { "DOCKERFILE #{dockerfile} not found" }
+          exit 1
+      end
+    rescue Exception => e
+      log.fatal("Error encountered while building images")
+      log.fatal(e)
+    end
+  end
   desc "version", "Print version and exit"
   def version
     puts "baha " + Baha::VERSION

data/lib/baha/config.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'pathname'
 require 'baha/log'
+require 'baha/dockerfile'
 
 class Baha::Config
   DEFAULTS = {
@@ -84,6 +85,18 @@ class Baha::Config
           LOG.error { "Unable to find image include: #{path}"}
           next
         end
+      elsif image.has_key?('dockerfile')
+        path = Pathname.new(image['dockerfile'])
+        file = resolve_file(path)
+        if file
+          dockerfile = Baha::Dockerfile.parse(file)
+          dockerfile['name'] = image['name']
+          dockerfile['tag'] = image['tag']
+          yield Baha::Image.new(self,dockerfile)
+        else
+          LOG.error { "Unable to find dockerfile: #{path}"}
+          next
+        end
       else
         yield Baha::Image.new(self,image)
       end

data/lib/baha/container_options/exposed_ports.rb

@@ -15,7 +15,11 @@ module Baha
             when Fixnum
               config['ExposedPorts']["#{port}/tcp"] = {}
             when String
-              config['ExposedPorts'][port] = {}
+              if port.match(/^\d+$/)
+                config['ExposedPorts']["#{port}/tcp"] = {}
+              else
+                config['ExposedPorts'][port] = {}
+              end
           end
         end
       end
@@ -24,7 +28,7 @@ module Baha
         raise ERROR("should be an array") unless @value.kind_of?(Array)
         @value.each_with_index do |item,index|
           if item.kind_of?(String)
-            unless /(\d+)\/(tcp|udp)/ =~ item
+            unless /(\d+)(\/(tcp|udp))?/ =~ item
               raise ERROR("#{index}: '#{item}' should be in the form 8080/tcp")
             end
           end

data/lib/baha/dockerfile.rb

@@ -0,0 +1,150 @@
+require 'docker'
+require 'baha/container_options'
+require 'baha/log'
+require 'set'
+require 'json'
+require 'csv'
+require 'yaml'
+
+module Baha
+  class DockerfileParseError < RuntimeError
+    attr_reader :file, :line, :text
+    def initialize(file,line, text)
+      super("Unable to parse Dockerfile #{file}:#{line}\n#{text}")
+      @file = file
+      @line = line
+      @text = text
+    end
+  end
+  class Dockerfile
+    LOG = Baha::Log.for_name("Dockerfile")
+    class << self
+      def parse(file)
+        LOG.info { "Parsing Dockerfile: #{file}" }
+        linenum = 0
+        image = {
+          'run' => [],
+          'pre_build' => [],
+          'config' => {}
+        }
+        multiline = []
+        f = File.open(file, "r")
+        begin
+          f.each_line do |rawline|
+            linenum = linenum + 1
+            line = rawline.chomp.gsub(/^\s*/,'')
+            # Skip empty lines
+            next if line.empty?
+            # Skip comments
+            next if line.match(/^#/)
+            
+            # Buffer multi-lines
+            if line.match(/\\$/)
+              multiline << line.chop
+              next
+            end
+            multiline << line
+
+
+            line_to_parse = multiline.join("\n")
+            LOG.debug { "Parsing #{linenum}: #{line_to_parse}" }
+            unless parse_line(image,line_to_parse)
+              raise DockerfileParseError.new(file,linenum, line_to_parse)
+            end
+            multiline = []
+          end
+        ensure
+          f.close
+        end
+        image
+      end
+
+      def as_array(args)
+        begin
+          return JSON.parse(args)
+        rescue
+          return CSV.parse_line(args,{:col_sep => " ", })
+        end
+      end
+
+      def as_cmd(cmd)
+        begin
+          return JSON.parse(cmd)
+        rescue
+          cmd
+        end
+      end
+
+      def append_attr(image,key,value)
+        image[key] = [] unless image.has_key?(key)
+        case value
+        when Array
+          image[key].concat(value)
+        else
+          image[key].push(value)
+        end
+      end
+
+      # Resolve environment variables in the string
+      def resolve_env(image,value)
+        if image['config'].has_key?('env')
+          env = image['config']['env']
+          env.keys.reduce(value) do |v,k|
+            r = Regexp.new("(?<!\\\\)[$](?:\\{#{k}\\}|#{k})")
+            v.gsub(r,env[k])
+          end
+        else
+          value
+        end
+      end
+
+      # Sets the workdir on the image config
+      def set_workdir(image,value)
+        wd = image['config']['workingdir']
+        if wd
+          wd = (Pathname.new(wd) + value).to_s
+        else
+          wd = value
+        end
+        image['config']['workingdir'] = resolve_env(image,wd)
+      end
+
+      def set_env(image,value)
+        k,v = value.split(/\s+/,2)
+        image['config']['env'] ||= {}
+        image['config']['env'][k] = v
+      end
+
+      # Parse a line and configure the image
+      def parse_line(image,line)
+        cmd, args =  line.split(/\s+/,2)
+        cmd = cmd.downcase.to_sym
+        case cmd
+        when :from
+          image['parent'] = args
+        when :maintainer
+          image['maintainer'] = args
+        when :expose
+          append_attr(image['config'],'exposedports',resolve_env(image,args))
+        when :volume
+          append_attr(image['config'],'volumes',as_array(resolve_env(image,args)))
+        when :entrypoint
+          image['config']['entrypoint'] = as_cmd(args)
+        when :cmd
+          image['config']['cmd'] = as_cmd(args)
+        when :run
+          image['run'] << as_cmd(args)
+        when :user
+          image['config']['user'] = resolve_env(image,args)
+        when :workdir
+          set_workdir(image,args)
+        when :env
+          set_env(image,resolve_env(image,args))
+        else
+          return false
+        end
+        true
+      end
+    end
+  end
+end

data/lib/baha/image.rb

@@ -65,7 +65,7 @@ module Baha
         end
 
     end
-    attr_reader :parent, :image, :maintainer, :options, :pre_build, :bind, :command, :timeout, :workspace, :name, :tags
+    attr_reader :parent, :image, :maintainer, :options, :pre_build, :bind, :command, :timeout, :workspace, :name, :tags, :run
 
     def initialize(config,image)
       @parent = Baha::Image.parse_with_default(image['parent'] || config.defaults[:parent], config.defaults[:repository])
@@ -76,6 +76,7 @@ module Baha
       @pre_build = image['pre_build']
       @bind = image['bind'] || config.defaults[:bind]
       @command = image['command'] || config.defaults[:command]
+      @run = image['run']
       @timeout = image['timeout'] || config.defaults[:timeout]
       @workspace = config.workspace + (image['workspace'] || @image[:name])
       @name = @image[:name]

data/lib/baha/version.rb

@@ -1,3 +1,3 @@
 module Baha
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/builder_spec.rb

@@ -44,10 +44,15 @@ describe Baha::Builder do
       let(:image2) {
         double('image2')
       }
+      let (:init) {
+        double('init.sh')
+      }
       before do
         allow_any_instance_of(Baha::Image).to receive(:needs_update?).and_return(true)
         allow_any_instance_of(Baha::Image).to receive(:parent_id).and_return('AAAA')
         allow(Docker::Container).to receive(:create).and_return(container)
+        allow(File).to receive(:open).and_call_original
+        allow(File).to receive(:open).with(pathname_matching(/init.sh$/),'w').and_yield(init)
         allow(container).to receive(:start)
         allow(container).to receive(:stop)
         allow(container).to receive(:streaming_logs).with({"stdout"=>true, "stderr"=>true, "follow"=>true, "timestamps"=>false}).and_yield(:stdout,"console message").and_yield(:stderr,"error line")
@@ -57,22 +62,30 @@ describe Baha::Builder do
         allow(Docker::Image).to receive(:get).with('BBBB').and_return(image)
         allow(image).to receive(:tag)
         allow(container).to receive(:remove)
+        allow(init).to receive(:write)
       end
       it 'executes pre_build step' do
         subject.build!
         expect(Baha::PreBuild::Module).to have_received(:execute).twice.with(hash_including('download' => "http://www.google.com"))
       end
+      it 'write run script' do
+        subject.build!
+        expect(init).to have_received(:write).with("#!/bin/sh\n").ordered
+        expect(init).to have_received(:write).with("set -xe\n").ordered
+        expect(init).to have_received(:write).with("echo \"Hello\"\n").ordered
+        expect(init).to have_received(:write).with("/bin/echo World\n").ordered
+      end
       it 'creates containers' do
         subject.build!
         expect(Docker::Container).to have_received(:create).twice.with({"Image"=>"AAAA", "Cmd"=>["/bin/bash", "./init.sh"], "Workingdir"=>"/.baha"})
       end
       it 'starts containers' do
         subject.build!
-        expect(container).to have_received(:start).twice
+        expect(container).to have_received(:start).exactly(3).times
       end
       it 'commits containers' do
         subject.build!
-        expect(container).to have_received(:commit).with({"run"=>{"ExposedPorts"=>{"8080/tcp"=>{}}}}).ordered
+        expect(container).to have_received(:commit).with({"run"=>{"ExposedPorts"=>{"8080/tcp"=>{}, "8081/tcp"=>{}, "8009/tcp"=>{}}}}).ordered
         expect(container).to have_received(:commit).with({'run' => {}}).ordered
       end
       it 'tags image' do

data/spec/config_spec.rb

@@ -39,6 +39,22 @@ describe Baha::Config do
       its(:configdir) { should eq(fixture_path) }
       its(:workspace) { should eq(fixture_path + 'workspace') }
     end
+    context "with dockerfile" do
+      subject { Baha::Config.load(fixture('config_dockerfile.yml')) }
+      its(:defaults) { should eq(
+        {
+          :parent=>"ubuntu:14.04.1", 
+          :bind=>"/.baha", 
+          :repository=>'docker.example.com/baha', 
+          :maintainer => "Ishmael <ishmael@example.com>",
+          :command => ['/bin/bash','./init.sh'],
+          :timeout => 1200
+        }) 
+      }
+      its(:options) { should eq({}) }
+      its(:configdir) { should eq(fixture_path) }
+      its(:workspace) { should eq(fixture_path + 'workspace') }
+    end
     context "with DOCKER_CERT_PATH set" do
       subject { Baha::Config.load(fixture('config_embedded.yml')) } 
       before do
@@ -87,7 +103,7 @@ describe Baha::Config do
       subject.each_image do |image|
         images << image
       end
-      expect(images.size).to eq(2)
+      expect(images.size).to eq(3)
     end
   end
 end

data/spec/dockerfile_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'baha/config'
+
+describe Baha::Config do
+  before do
+    ENV['DOCKER_CERT_PATH'] = nil
+    ENV['DOCKER_TLS_VERIFY'] = nil
+  end
+  describe "#parse" do
+    context "with valid Dockerfile" do
+      subject { Baha::Dockerfile.parse(fixture('Dockerfile')) }
+      its(['parent']) { should eq('ubuntu:14.04.1')}
+      its(['run']) { should eq([
+        "echo \"Hello\"", 
+        ["/bin/echo", "World"], 
+        "echo Hello \nworld \nmultiline"])}
+      its(['config']) { should eq({
+        "entrypoint"=>["/bin/bash"], 
+        "exposedports"=>["8080", "8081", "8009"], 
+        "env"=>{
+          "HOME"=>"/home/user", 
+          "BIN_DIR"=>"bin", 
+          "HOME2"=>"/home/user/two", 
+          "USER"=>"daemon"}, 
+        "workingdir"=>"/home/user/bin/b/c", 
+        "cmd"=>"-l", 
+        "user"=>"daemon", 
+        "volumes"=>[
+          "/home/user", 
+          "/logs", 
+          "/home/user/logs", 
+          "/data"]})}
+    end
+    context "with invalid Dockerfile" do
+      it { expect { Baha::Dockerfile.parse(fixture('Dockerfile.invalid')) }.to raise_error(Baha::DockerfileParseError)  }
+    end
+  end
+end

data/spec/fixtures/Dockerfile

@@ -0,0 +1,33 @@
+# Comment
+FROM ubuntu:14.04.1
+
+MAINTAINER "Captain Ahab" <ahab@example.com>
+
+RUN echo "Hello"
+RUN ["/bin/echo", "World"]
+RUN echo Hello \
+  world \
+  multiline
+
+ENTRYPOINT ["/bin/bash"]
+
+EXPOSE 8080
+EXPOSE 8081
+EXPOSE 8009
+
+ENV HOME /home/user
+ENV BIN_DIR bin
+ENV HOME2 $HOME/two
+ENV USER daemon
+
+WORKDIR ${HOME}
+WORKDIR $BIN_DIR
+WORKDIR b
+WORKDIR c
+
+CMD -l
+
+USER ${USER}
+
+VOLUME $HOME /logs
+VOLUME ["$HOME/logs", "/data"]

data/spec/fixtures/Dockerfile.invalid

@@ -0,0 +1,4 @@
+# Comment
+FROM ubuntu:14.04.1
+
+INVALID line here

data/spec/fixtures/config_build.yml

@@ -9,4 +9,7 @@ images:
     name: derived
     tag: 1.0.0
     pre_build:
-    - { download: 'http://www.google.com', file: 'myfile.txt' }
+    - { download: 'http://www.google.com', file: 'myfile.txt' }
+  - name: dockerfile
+    tag: 1.0
+    dockerfile: Dockerfile

data/spec/fixtures/config_build_image.yml

@@ -7,4 +7,6 @@ pre_build:
 - { download: 'http://www.google.com', file: 'myfile.txt' }
 config:
   exposedports: 
-  - 8080
+  - 8080
+  - '8081'
+  - 8009/tcp

data/spec/fixtures/config_dockerfile.yml

@@ -0,0 +1,9 @@
+---
+defaults:
+  parent: ubuntu:14.04.1
+  repository: docker.example.com/baha
+  maintainer: Ishmael <ishmael@example.com>
+images:
+  - dockerfile: Dockerfile
+    name: base
+    tag: 1.0.0

data/spec/fixtures/config_eachimage.yml

@@ -9,4 +9,10 @@ images:
   - parent: 'ubuntu:14.04.1'
     name: base
     tag: 1.0.0
-    maintainer: '"Captain Ahab" <ahab@example.com>'
+    maintainer: '"Captain Ahab" <ahab@example.com>'
+  - dockerfile: Dockerfile
+    name: dockerfile
+    tag: 1.0.0
+  - dockerfile: no such dockerfile
+    name: invalid
+    tag: 1.0.0

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'simplecov'
 SimpleCov.start do
   add_filter '/spec/'
@@ -36,4 +39,15 @@ RSpec.configure do |config|
   config.before(:each) do
     Baha::Log.logfile = StringIO.new
   end
+end
+
+RSpec::Matchers.define :pathname_matching do |expected|
+  match do |actual|
+    case expected
+    when Regexp
+      expected.match(actual.to_s) != nil
+    else
+      expected == actual
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baha
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Justen Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,7 +136,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: Baha - A tool for describing image builds for Docker
+description: ! 'Baha is a command-line utility that assists in the creation of docker
+  images.
+
+  It addresses some of Dockerfiles shortcomings and encourages smaller, reusable,
+  tagged images.'
 email:
 - justen.walker+github@gmail.com
 executables:
@@ -146,6 +150,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,6 +161,7 @@ files:
 - example/base/init.sh.erb
 - example/base/test-template.erb
 - example/example.yml
+- example/memcached/Dockerfile
 - example/rvm/image.yml
 - example/rvm/init.sh.erb
 - lib/baha.rb
@@ -170,6 +176,7 @@ files:
 - lib/baha/container_options/invalid_option_error.rb
 - lib/baha/container_options/option.rb
 - lib/baha/container_options/volumes.rb
+- lib/baha/dockerfile.rb
 - lib/baha/image.rb
 - lib/baha/log.rb
 - lib/baha/pre_build.rb
@@ -186,9 +193,13 @@ files:
 - spec/container_options/exposed_ports_spec.rb
 - spec/container_options/option_spec.rb
 - spec/container_options/volumes_spec.rb
+- spec/dockerfile_spec.rb
+- spec/fixtures/Dockerfile
+- spec/fixtures/Dockerfile.invalid
 - spec/fixtures/base_image.yml
 - spec/fixtures/config_build.yml
 - spec/fixtures/config_build_image.yml
+- spec/fixtures/config_dockerfile.yml
 - spec/fixtures/config_eachimage.yml
 - spec/fixtures/config_embedded.yml
 - spec/fixtures/config_include.yml
@@ -203,7 +214,7 @@ files:
 - spec/pre_build/template_spec.rb
 - spec/pre_build_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/justenwalker/baha
 licenses:
 - MIT
 metadata: {}
@@ -226,7 +237,7 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Baha - A tool for describing image builds for Docker
+summary: Baha is a command-line utility that assists in the creation of docker images.
 test_files:
 - spec/builder_spec.rb
 - spec/config_spec.rb
@@ -236,9 +247,13 @@ test_files:
 - spec/container_options/exposed_ports_spec.rb
 - spec/container_options/option_spec.rb
 - spec/container_options/volumes_spec.rb
+- spec/dockerfile_spec.rb
+- spec/fixtures/Dockerfile
+- spec/fixtures/Dockerfile.invalid
 - spec/fixtures/base_image.yml
 - spec/fixtures/config_build.yml
 - spec/fixtures/config_build_image.yml
+- spec/fixtures/config_dockerfile.yml
 - spec/fixtures/config_eachimage.yml
 - spec/fixtures/config_embedded.yml
 - spec/fixtures/config_include.yml