dry-dock 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2627cbab1b9589543ec9a8997d95eb6071ecd17a
-  data.tar.gz: 6fe87f56623532901d4fb285a8cc07a584007cb0
+  metadata.gz: 724b93603dd12d8266b970fcfd095031882aa55e
+  data.tar.gz: e98e3ac6436a74e1d550742856b9b6cd5ff524f5
 SHA512:
-  metadata.gz: f4360c64a1b7d07b36ef1e6e79fc6fb65d73b14ecea226be78bc75819f0fe77b7fbe4f24b0572bfcb4d84900167f442f1709d332d6d5f71cee5b6d66660e5495
-  data.tar.gz: b28fa39b7acbe2e4044b7f75748d314b198f9f90b9da2098bb96552c5495da6548a9daf53080cc672984368464ac343d1124892443587cb5c879bcf975a7b16d
+  metadata.gz: 445f04f2533c11dc3bce10be0f137919a898eca7bf67be0c70a754bd5c1a48d7ff5aab63d6b7032613a77ef183364d2e615d00538535786f431ef57d012d8914
+  data.tar.gz: c7d058056ed5273ba4dc1aca588b2783ae5c5476cb6ed7443957579aa87e6d67a58b8203d500993de2a423d95e3e838d4c0fe7c9ee4b24cfb38a6a4d40f5992c

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/.travis.yml

@@ -3,13 +3,12 @@ services:
 - docker
 language: ruby
 rvm:
-- 2.1.5
+- 2.2.3
 before_install:
-- sudo service docker stop
-- sudo apt-get purge lxc-docker-1.7.0
-- curl -sSL https://get.docker.com/ | sudo sh
 - docker version
 - docker info
+- docker pull alpine:latest
+- docker pull alpine:3.2
 script: bundle exec rspec
 addons:
   code_climate:

data/Gemfile

@@ -19,6 +19,6 @@ group :test do
 end
 
 gem 'attr_extras', '~> 4.4'
-gem 'docker-api', '~> 1.22', require: 'docker'
+gem 'docker-api', '~> 1.24', require: 'docker'
 gem 'excon', '~> 0.45'
 gem 'memoist', '~> 0.12'

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.22.4)
+    docker-api (1.24.1)
       excon (>= 0.38.0)
       json
     excon (0.45.4)
@@ -107,7 +107,7 @@ PLATFORMS
 DEPENDENCIES
   attr_extras (~> 4.4)
   codeclimate-test-reporter
-  docker-api (~> 1.22)
+  docker-api (~> 1.24)
   excon (~> 0.45)
   fakefs
   jeweler (~> 2.0)
@@ -121,4 +121,4 @@ DEPENDENCIES
   simplecov-rcov (~> 0.2)
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/README.md

@@ -1,7 +1,10 @@
 # drydock
 
-WORK IN PROGRESS — ALPHA-RELEASE SOFTWARE
-SOME FEATURES REQUIRE DOCKER 1.8.0 OR NEWER
+**WARNING:** Work in progress. Although this software has test coverage, it is
+considered unstable. Refer to [LICENSE](LICENSE.md) for licensing information.
+
+See section on [Compatibility](#compatibility) for a list of supported Docker
+versions for every Drydock version.
 
 [![Automated Build Status](https://travis-ci.org/ripta/drydock.svg)](https://travis-ci.org/ripta/drydock)
 [![Code Climate](https://codeclimate.com/github/ripta/drydock/badges/gpa.svg)](https://codeclimate.com/github/ripta/drydock)
@@ -100,6 +103,16 @@ branch, make your changes, commit, and open a pull request.
 After cloning your repo, `bundle` should take care of it.
 
 
+## Release
+
+```
+$ bundle
+$ # increment VERSION file
+$ bundle exec rake gemspec build
+$ # upload .gem file to rubygems.org
+```
+
+
 ## Roadmap
 
 1. Customizable caching subsystem with pluggable caching strategies.
@@ -107,3 +120,13 @@ After cloning your repo, `bundle` should take care of it.
 3. Unarchiving a file directly into a container.
 4. Proper `ONBUILD` implementation and expanded support for hooks.
 5. Drydock instructions corresponding to `LABEL`, `VOLUME`, `USER`, and `WORKDIR` Docker instructions.
+
+
+## Compatibility
+
+The following version combinations are officially tested and supported:
+
+| Docker Versions | Drydock Versions |
+| --------------- | ---------------- |
+| v1.8.0          | v0.1.0 onwards   |
+| v1.9.0          | v0.2.0 onwards   |

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/dry-dock.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dry-dock 0.1.6 ruby lib
+# stub: dry-dock 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dry-dock"
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ripta Pasay"]
-  s.date = "2015-10-08"
+  s.date = "2016-01-08"
   s.description = "A Dockerfile-replacement DSL for building complex images"
   s.email = "github@r8y.org"
   s.executables = ["drydock", "json-test-consumer.rb", "json-test-producer.rb", "test-tar-writer-digest.rb"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     ".pryrc",
     ".rspec",
     ".rubocop.yml",
+    ".ruby-version",
     ".travis.yml",
     ".yardopts",
     "Dockerfile",
@@ -105,7 +106,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ripta/drydock"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5.1"
   s.summary = "Docker Image Pipeline DSL"
 
   if s.respond_to? :specification_version then
@@ -113,7 +114,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<attr_extras>, ["~> 4.4"])
-      s.add_runtime_dependency(%q<docker-api>, ["~> 1.22"])
+      s.add_runtime_dependency(%q<docker-api>, ["~> 1.24"])
       s.add_runtime_dependency(%q<excon>, ["~> 0.45"])
       s.add_runtime_dependency(%q<memoist>, ["~> 0.12"])
       s.add_development_dependency(%q<rake>, ["~> 10.0"])
@@ -124,7 +125,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov-rcov>, ["~> 0.2"])
     else
       s.add_dependency(%q<attr_extras>, ["~> 4.4"])
-      s.add_dependency(%q<docker-api>, ["~> 1.22"])
+      s.add_dependency(%q<docker-api>, ["~> 1.24"])
       s.add_dependency(%q<excon>, ["~> 0.45"])
       s.add_dependency(%q<memoist>, ["~> 0.12"])
       s.add_dependency(%q<rake>, ["~> 10.0"])
@@ -136,7 +137,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<attr_extras>, ["~> 4.4"])
-    s.add_dependency(%q<docker-api>, ["~> 1.22"])
+    s.add_dependency(%q<docker-api>, ["~> 1.24"])
     s.add_dependency(%q<excon>, ["~> 0.45"])
     s.add_dependency(%q<memoist>, ["~> 0.12"])
     s.add_dependency(%q<rake>, ["~> 10.0"])

data/lib/drydock/container_config.rb

@@ -32,6 +32,7 @@ module Drydock
     end
 
     # Logic taken from https://github.com/docker/docker/blob/master/runconfig/compare.go
+    # Last updated to conform to docker v1.9.1
     def ==(other)
       return false if other.nil?
 
@@ -44,7 +45,7 @@ module Drydock
 
       return false if self['Cmd'] != other['Cmd']
       return false if Array(self['Env']).sort != Array(other['Env']).sort
-      return false if self['Labels'] != other['Labels']
+      return false if (self['Labels'] || {}) != (other['Labels'] || {})
       return false if self['Entrypoint'] != other['Entrypoint']
 
       my_ports = self['ExposedPorts'] || {}

data/lib/drydock/image_repository.rb

@@ -41,7 +41,7 @@ module Drydock
     end
 
     def self.select_by_config(config)
-      # we want to look at 'ContainerConfig', because we're interesting in how
+      # Look at 'ContainerConfig' instead of 'Config', because we're interesting in how
       # the image was built, not how the image will run
       self.select { |image| config == ContainerConfig.from(image.info['ContainerConfig']) }
     end

data/lib/drydock/phase.rb

@@ -20,6 +20,11 @@ module Drydock
       new(*h.values_at(*members))
     end
 
+    def initialize(*args)
+      super
+      @finalized = false
+    end
+
     def built?
       !cached?
     end
@@ -29,6 +34,10 @@ module Drydock
     end
 
     def destroy!(force: false)
+      return self if frozen?
+
+      finalize!(force: force)
+
       if result_image
         begin
           result_image.remove(force: force)
@@ -38,15 +47,21 @@ module Drydock
         end
       end
 
-      build_container.remove(force: force) if built?
-      self
+      freeze
     end
 
     def finalize!(force: false)
-      return self unless built?
-      build_container.remove(force: force)
+      unless finalized?
+        build_container.remove(force: force) if built?
+        @finalized = true
+      end
+
       self
     end
 
+    def finalized?
+      @finalized
+    end
+
   end
 end

data/lib/drydock/phase_chain.rb

@@ -53,9 +53,9 @@ module Drydock
 
     def self.build_pull_opts(repo, tag = nil)
       if tag
-        {fromImage: repo, tag: tag}
+        {fromImage: "#{repo}:#{tag}"}
       else
-        {fromImage: repo}
+        {fromImage: "#{repo}:latest"}
       end
     end
 
@@ -64,6 +64,7 @@ module Drydock
       meta_options = cfg[:MetaOptions] || {}
       timeout = meta_options.fetch(:read_timeout, Excon.defaults[:read_timeout]) || 60
       
+      Drydock.logger.debug(message: "Create container configuration: #{cfg.inspect}")
       Docker::Container.create(cfg).tap do |c|
         # The call to Container.create merely creates a container, to be
         # scheduled to run. Start a separate thread that attaches to the
@@ -153,6 +154,8 @@ module Drydock
       @parent = parent
       @children = []
 
+      @finalized = false
+
       @ephemeral_containers = []
 
       if parent
@@ -178,10 +181,11 @@ module Drydock
 
     def destroy!(force: false)
       return self if frozen?
+
+      finalize!
       children.reverse_each { |c| c.destroy!(force: force) } if children
-      ephemeral_containers.map { |c| c.remove(force: force) }
+      reverse_each { |p| p.destroy!(force: force) }
 
-      reverse_each { |c| c.destroy!(force: force) }
       freeze
     end
 
@@ -194,14 +198,20 @@ module Drydock
     end
 
     def finalize!(force: false)
-      return self if frozen?
+      return self if finalized?
 
-      children.map { |c| c.finalize!(force: force) } if children
-      ephemeral_containers.map { |c| c.remove(force: force) }
+      children.reverse_each { |c| c.finalize!(force: force) } if children
+      ephemeral_containers.reverse_each { |c| c.remove(force: force) }
 
       Drydock.logger.info("##{serial}: Final image ID is #{last_image.id}") unless empty?
-      map { |p| p.finalize!(force: force) }
-      freeze
+      reverse_each { |p| p.finalize!(force: force) }
+
+      @finalized = true
+      self
+    end
+
+    def finalized?
+      @finalized
     end
 
     def images
@@ -223,6 +233,7 @@ module Drydock
       no_cache = opts.fetch(:no_cache, false)
       no_cache = true if no_commit
 
+      Drydock.logger.debug(message: "Source image: #{src_image.inspect}")
       build_config = self.class.build_container_opts(src_image.id, cmd, opts)
       cached_image = ImageRepository.find_by_config(build_config)
 

data/lib/drydock/project.rb

@@ -157,12 +157,15 @@ module Drydock
     end
 
     # Destroy the images and containers created, and attempt to return the docker
-    # state as it was before the project.
+    # state as it was before the project. The project object itself cannot be reused
+    # after it is destroyed.
     #
     # @api private
     def destroy!(force: false)
-      chain.destroy!(force: force) if chain
+      return self if frozen?
       finalize!(force: force)
+      chain.destroy!(force: force) if chain
+      freeze
     end
 
     # Meta instruction to signal to the builder that the build is done.
@@ -395,8 +398,12 @@ module Drydock
     # Finalize everything. This will be automatically invoked at the end of
     # the build, and should not be called manually.
     #
+    # No further changes to the object is possible after finalization.
+    #
     # @api private
     def finalize!(force: false)
+      return self if finalized?
+
       if chain
         chain.finalize!(force: force)
       end
@@ -406,6 +413,7 @@ module Drydock
         stream_monitor.join
       end
 
+      @finalized = true
       self
     end
 
@@ -474,6 +482,10 @@ module Drydock
       end
     end
 
+    def finalized?
+      @finalized
+    end
+
     # Access to the logger object.
     #
     # @return [Logger] A logger object on which one could call `#info`, `#error`,

data/spec/drydock/image_repository_spec.rb

@@ -1,6 +1,6 @@
 
 RSpec.describe Drydock::ImageRepository do
-  
+
   describe '.all' do
     it 'completes without an error' do
       expect { described_class.all }.not_to raise_error
@@ -23,7 +23,7 @@ RSpec.describe Drydock::ImageRepository do
 
   describe '.find_by_config' do
     let(:cmd)       { '/bin/ls -l' }
-    let(:image)     { Docker::Image.create(fromImage: 'alpine', tag: 'latest') }
+    let(:image)     { Docker::Image.create(fromImage: 'alpine:latest') }
     let(:container) { image.run(cmd).tap(&:wait) }
     let(:run_image) { container.commit }
 

data/spec/drydock/phase_chain_spec.rb

@@ -1,13 +1,6 @@
 
 RSpec.describe Drydock::PhaseChain do
 
-  EXPECTED_IMAGE_TO_ID_MAPPINGS = {
-    'alpine' => {
-      '3.2'    => 'f4fddc471ec2',
-      'latest' => 'f4fddc471ec2'
-    }
-  }
-
   describe '.from_repo' do
 
     it 'takes a repo name forced without a tag' do
@@ -32,8 +25,13 @@ RSpec.describe Drydock::PhaseChain do
       expect(subject).to be_a(Docker::Image)
     end
 
-    it 'matches the image ID' do
-      expect(subject.id).to eq(EXPECTED_IMAGE_TO_ID_MAPPINGS['alpine']['3.2'])
+    it 'matches the image tag' do
+      expect(subject.info).not_to be_nil
+
+      # Docker Remote API v1.21 introduced RepoTags
+      if subject.info.key?('RepoTags')
+        expect(subject.info['RepoTags']).to include('alpine:3.2')
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Ripta Pasay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - Dockerfile
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Docker Image Pipeline DSL