dockly 2.1.0 → 2.2.0

data/README.md

@@ -111,6 +111,9 @@ The `docker` DSL is used to define Docker containers. It has the following attri
     - required: `false` -- only required when `import` is not supplied
     - description: the location  of the base image to start building from
     - examples: `paintedfox/ruby`, `registry.example.com/my-custom-image`
+- `build_env`
+    - required: `false`
+    - description: Hash whose values are environment variables and keys are their values. These variables are only used during build commands, exported images will not contain them.
 - `import`
     - required: `false` -- only required when `registry_import` is not supplied
     - description: the location (url or S3 path) of the base image to start building from

data/lib/dockly/docker.rb

@@ -28,6 +28,10 @@ class Dockly::Docker
   default_value :s3_bucket, nil
   default_value :s3_object_prefix, ""
 
+  def build_env(hash = nil)
+    (@build_env ||= {}).tap { |env| env.merge!(hash) if hash.is_a?(Hash) }
+  end
+
   def generate!
     image = generate_build
     export_image(image)
@@ -50,9 +54,10 @@ class Dockly::Docker
       info "Successfully pulled #{full_name}"
     end
 
-    images[:two] = add_git_archive(images[:one])
-    images[:three] = run_build_caches(images[:two])
-    build_image(images[:three])
+    images[:two] = add_build_env(images[:one])
+    images[:three] = add_git_archive(images[:two])
+    images[:four] = run_build_caches(images[:three])
+    build_image(images[:four])
   ensure
     cleanup(images.values.compact) if cleanup_images
   end
@@ -69,6 +74,8 @@ class Dockly::Docker
 
   def cleanup(images)
     info 'Cleaning up intermediate images'
+    images ||= []
+    images = images.compact
     ::Docker::Container.all(:all => true).each do |container|
       image_id = container.json['Image']
       if images.any? { |image| image.id.start_with?(image_id) || image_id.start_with?(image.id) }
@@ -144,6 +151,18 @@ class Dockly::Docker
     image
   end
 
+  def add_build_env(image)
+    return image if build_env.empty?
+    info "Setting the following environment variables in the docker image: #{build_env.keys}"
+    dockerfile = [
+      "FROM #{image.id}",
+      *build_env.map { |key, val| "ENV #{key.to_s.shellescape}=#{val.to_s.shellescape}" }
+    ].join("\n")
+    out_image = ::Docker::Image.build(dockerfile)
+    info "Successfully set the environment variables in the dockerfile"
+    out_image
+  end
+
   def add_git_archive(image)
     return image if git_archive.nil?
     info "adding the git archive"

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/dockly/build_cache/docker_spec.rb

@@ -7,7 +7,7 @@ describe Dockly::BuildCache::Docker, :docker do
       git_archive '/app'
     end
   end
-  let(:image) { ::Docker::Image.build('from base') }
+  let(:image) { ::Docker::Image.build('from ubuntu:14.04') }
 
   before do
     build_cache.s3_bucket 'lol'
@@ -100,7 +100,7 @@ describe Dockly::BuildCache::Docker, :docker do
 
   describe '#hash_output' do
     let(:output) {
-      "682aa2a07693cc27756eee9751db3903  /etc/vim/vimrc"
+      "b458e7b28b9bc2d04bd5a3fd0f8d777e  /etc/vim/vimrc"
     }
 
     context "when hash command returns successfully" do
@@ -127,7 +127,7 @@ describe Dockly::BuildCache::Docker, :docker do
   end
 
   describe '#copy_output_dir' do
-    let(:container) { Docker::Container.create('Image' => 'base', 'Cmd' => %w[true]) }
+    let(:container) { Docker::Container.create('Image' => 'ubuntu:14.04', 'Cmd' => %w[true]) }
     let(:file) { build_cache.copy_output_dir(container) }
     let(:hash) { 'this_really_unique_hash' }
     let(:path) { file.path }
@@ -156,7 +156,7 @@ describe Dockly::BuildCache::Docker, :docker do
     context "when parameter command returns successfully" do
       let(:command) { "uname -r" }
       it 'returns the output of the parameter_command' do
-        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d-ARCH\Z/)
+        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d{2}-generic\Z/)
       end
     end
 

data/spec/dockly/deb_spec.rb

@@ -52,7 +52,7 @@ describe Dockly::Deb do
         subject.create_package!
       end
 
-      it 'exports the foreman to the deb', :cur do
+      it 'exports the foreman to the deb' do
         expect(contents).to match(/upstart-foreman/)
         expect(contents).to match(/systemd-foreman/)
       end

data/spec/dockly/docker_spec.rb

@@ -148,7 +148,7 @@ describe Dockly::Docker do
   end
 
   describe "#export_image", :docker do
-    let(:image) { Docker::Image.create('fromImage' => 'base') }
+    let(:image) { Docker::Image.create('fromImage' => 'ubuntu:14.04') }
 
     context "with a registry export" do
       let(:registry) { double(:registry) }
@@ -250,7 +250,7 @@ describe Dockly::Docker do
     let(:docker_file) { 'build/docker/dockly_test-image.tgz' }
     before { FileUtils.rm_rf(docker_file) }
 
-    context 'without cleaning up' do
+    context 'with cleaning up' do
       before do
         subject.instance_eval do
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
@@ -258,7 +258,7 @@ describe Dockly::Docker do
           build "run touch /it_worked"
           repository 'dockly_test'
           build_dir 'build/docker'
-          cleanup_images false
+          cleanup_images true
         end
       end
 
@@ -276,19 +276,20 @@ describe Dockly::Docker do
           paths.should include('sbin/init')
           paths.should include('lib/dockly.rb')
           paths.should include('it_worked')
-        }.to change { ::Docker::Image.all(:all => true).length }.by(3)
+        }.to_not change { ::Docker::Image.all(:all => true).length }
       end
     end
 
-    context 'with cleaning up' do
+    context 'without cleaning up' do
       before do
         subject.instance_eval do
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build "run touch /it_worked"
+          build_env 'TEST_FILE' => 'it_worked'
+          build "run touch $TEST_FILE"
           repository 'dockly_test'
           build_dir 'build/docker'
-          cleanup_images true
+          cleanup_images false
         end
       end
 
@@ -306,7 +307,7 @@ describe Dockly::Docker do
           paths.should include('sbin/init')
           paths.should include('lib/dockly.rb')
           paths.should include('it_worked')
-        }.to_not change { ::Docker::Image.all(:all => true).length }
+        }.to change { ::Docker::Image.all(:all => true).length }.by(4)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp