dockly 3.1.1 → 4.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQyMjgwNGJkYWE2YThjOTI1OTAxZWRlZmY5ZmIyNThhOThjNWFkMQ==
-  data.tar.gz: !binary |-
-    MjgxMDZlMTFmN2QxODZlYTJmZjRlZTJlMzlmNmJmNDA2ODZmNmRmNw==
+SHA256:
+  metadata.gz: cdd9e8a044854b4149effa288483edb90a66ee8f58d35108696f0abc3a21ed95
+  data.tar.gz: 8ee450caf29059b5c7a389683676953c02f3c497809eef2287648504d59c9023
 SHA512:
-  metadata.gz: !binary |-
-    NDk1ZjAzYmU3MGI3Njk0NDM5MDBkNWNhM2UyMWFiOGZmNDI5OGQ4MDA2Y2Zm
-    MjE2MzYzOThkYzg1MzZkNTZjZTM0MjEwY2I1ZGMwZTM1OTY4MTQ5ZTk0MTZi
-    ZGQyYzM4ODg2YjgyMmE4ZDYxMDIwZDY3ZDM3MGQyYmFkNDIyMTE=
-  data.tar.gz: !binary |-
-    MmM2YTFhODIzZWE3MTFlOWY4YTgyMGNlNzZkMWJiZmYxNDIzOTkxMTk1ZjMw
-    MTQxOTE2ODA2NjM4OGFiNjhlNGQyOTk2YWM1OTQ0ZDRhNzZkYjNhNmRhNDIz
-    NTg2ZjI1NTc5MWM3MzU3ZWFkNGJjZWUwZTVkYTA2MjQzMTg4ZTA=
+  metadata.gz: 2cf097573867f7c8ddafa597b0e0249780789fe098f6b4ffec3d48ae0b3dfc7cb6e48686214d846ab021c7cee5dec3bdd2c29f3423c1b82341d8173c2570fc05
+  data.tar.gz: 5bb556418f6b975bc1cd2dfffcb0117ee61379b6426be681a80961f4831976319f91fd78e0e81c94bcd4a5ce3a7a1bb093f39d77379b2bb1708d2da7e7cfbaae

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p547
+2.3.1

data/.travis.yml

@@ -1,14 +1,13 @@
 language: ruby
 rvm:
-    - 1.9
-    - 2.0
-    - 2.1
-    - 2.2
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
 script:
   - git fetch --tags
   - CI=true bundle exec rake
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq rpm
-  - gem install bundler
-
+  - gem install bundler -v 1.17.3

data/README.md

@@ -174,6 +174,11 @@ In addition to the above attributes, `docker` has the following references:
     - allows one
     - class: `Dockly::Docker::Registry`
     - description: a registry to push to in lieu of exporting as a tar -- the registry will be automatically pulled upon installing the package
+- `ecr`
+    - required: `false`
+    - allows one
+    - class: `Dockly::Docker::ECR`
+    - description: an AWS ECR Docker registry to push to in lieu of exporting as a tar -- the registry will be automatically pulled upon installing the package
 
 Need finer control of Docker packages? We also wrote [docker-api](https://github.com/swipely/docker-api).
 
@@ -200,6 +205,23 @@ The `registry` DSL is used to define Docker Registries. It has the following att
     - default: `https://index.docker.io/v1`
     - description: the server where the registry lives
 
+`ecr`
+--------
+
+The `ecr` DSL is used to define AWS ECR Docker registries. It has the following attributes:
+
+- `server_address`
+    - required: `true`
+    - description: the server where the registry lives without the repo name, eg `accountid.dkr.ecr.region.amazonaws.com`
+- `username`
+    - required: `false`
+    - default: pulled from auth data obtained using assumed role's credentials
+    - description: the username to authenticate
+- `password`
+    - required: `false`
+    - default: pulled from auth data obtained using assumed role's credentials
+    - description: the password to authenticate
+
 `foreman`
 ---------
 

data/dockly.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'minigit', '~> 0.0.4'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '< 11.0'
   gem.add_development_dependency 'rspec', '~> 2.14.1'
   gem.add_development_dependency 'vcr'
-  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'webmock', '<= 1.18.0'
+  gem.add_development_dependency 'addressable', '<= 2.3.6'
 end

data/lib/dockly.rb

@@ -10,8 +10,9 @@ require 'open3'
 module Dockly
   LOAD_FILE = 'dockly.rb'
 
-  attr_reader :instance, :git_sha
-  attr_writer :load_file
+  class << self
+    attr_writer :load_file
+  end
 
   autoload :Foreman, 'dockly/foreman'
   autoload :BashBuilder, 'dockly/bash_builder'
@@ -30,7 +31,7 @@ module Dockly
     @load_file || LOAD_FILE
   end
 
-  def inst
+  def instance
     @instance ||= load_inst
   end
 
@@ -82,7 +83,7 @@ module Dockly
 
   [:debs, :rpms, :dockers, :foremans].each do |method|
     define_method(method) do
-      inst[method]
+      instance[method]
     end
 
     module_function method
@@ -96,7 +97,7 @@ module Dockly
   }.each do |method, klass|
     define_method(method) do |sym, &block|
       if block.nil?
-        inst[:"#{method}s"][sym]
+        instance[:"#{method}s"][sym]
       else
         klass.new!(:name => sym, &block)
       end

data/lib/dockly/bash_builder.rb

@@ -24,6 +24,7 @@ module Dockly
     generate_snippet_for :s3_docker_import, [:s3_url, :repo, :tag]
     generate_snippet_for :s3_diff_docker_import, [:base_image, :diff_image, :repo, :tag]
     generate_snippet_for :registry_import, [:repo, :tag], { :tag => "latest" }
+    generate_snippet_for :auth_ecr, [:server_address]
 
     generate_snippet_for :docker_tag_latest, [:repo, :tag]
   end

data/lib/dockly/build_cache/base.rb

@@ -89,11 +89,17 @@ class Dockly::BuildCache::Base
 
   def push_to_s3(file)
     ensure_present! :s3_bucket, :s3_object_prefix
-    connection.put_object(bucket: s3_bucket, key: s3_object(hash_output), body: file)
+    connection.put_object(
+      bucket: s3_bucket,
+      key: s3_object(hash_output),
+      body: file,
+      acl: 'bucket-owner-full-control',
+    )
     connection.copy_object(
       copy_source: [s3_bucket, s3_object(hash_output)].join('/'),
       bucket: s3_bucket,
-      key: s3_object('latest')
+      key: s3_object('latest'),
+      acl: 'bucket-owner-full-control',
     )
   end
 

data/lib/dockly/build_cache/docker.rb

@@ -77,7 +77,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     debug 'Restarting the container to copy the cache\'s output'
     # Restart the container so we can copy its output
     container = container.commit.run('sleep 3600')
-    container.copy(output_directory) { |chunk| file.write(chunk.to_s) }
+    container.archive_out(output_directory) { |chunk| file.write(chunk.to_s) }
     container.kill
     file.tap(&:rewind)
   end

data/lib/dockly/cli.rb

@@ -14,17 +14,40 @@ class Dockly::AbstractCommand < Clamp::Command
   end
 end
 
-class Dockly::BuildCommand < Dockly::AbstractCommand
+class Dockly::BuildOrCopyAllCommand < Dockly::AbstractCommand
+  def execute
+    super
+    Rake::Task["dockly:build_or_copy_all"].invoke
+  end
+end
+
+class Dockly::BuildDebCommand < Dockly::AbstractCommand
+  parameter 'PACKAGE', 'the name to build the package for', :attribute_name => :package_name
+  option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
+
+  def execute
+    super
+    if Dockly.debs[package_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:deb:prepare"].invoke(package_name)
+      else
+        Rake::Task["dockly:deb:build"].invoke(package_name)
+      end
+    end
+  end
+end
+
+class Dockly::BuildRpmCommand < Dockly::AbstractCommand
   parameter 'PACKAGE', 'the name to build the package for', :attribute_name => :package_name
-  option ['-f', '--force'], :flag, 'force the package build', :default => false, :attribute_name => :force
+  option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
 
   def execute
     super
-    if package = Dockly.debs[package_name.to_sym]
-      if force? || !package.exists?
-        package.build
+    if Dockly.rpms[package_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:rpm:prepare"].invoke(package_name)
       else
-        puts "Package already exists!"
+        Rake::Task["dockly:rpm:build"].invoke(package_name)
       end
     end
   end
@@ -32,20 +55,15 @@ end
 
 class Dockly::DockerCommand < Dockly::AbstractCommand
   parameter 'DOCKER', 'the name to generate the docker image for', :attribute_name => :docker_name
-  option ['-f', '--force'], :flag, 'force the package build', :default => false, :attribute_name => :force
   option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
 
   def execute
     super
-    if docker = Dockly.dockers[docker_name.to_sym]
-      if force? || !docker.exists?
-        if noexport?
-          docker.generate_build
-        else
-          docker.generate!
-        end
+    if Dockly.dockers[docker_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:docker:prepare"].invoke(docker_name)
       else
-        puts "Package already exists!"
+        Rake::Task["dockly:docker:build"].invoke(docker_name)
       end
     end
   end
@@ -56,6 +74,7 @@ class Dockly::ListCommand < Dockly::AbstractCommand
     super
     dockers = Dockly.dockers.dup
     debs = Dockly.debs
+    rpms = Dockly.rpms
 
     puts "Debs" unless debs.empty?
     debs.each_with_index do |(name, package), index|
@@ -66,6 +85,15 @@ class Dockly::ListCommand < Dockly::AbstractCommand
       end
     end
 
+    puts "RPMs" unless rpms.empty?
+    rpms.each_with_index do |(name, package), index|
+      puts "#{index + 1}. #{name}"
+      if package.docker
+        dockers.delete(package.docker.name)
+        puts " - Docker: #{package.docker.name}"
+      end
+    end
+
     puts "Dockers" unless dockers.empty?
     dockers.each_with_index do |(name, docker), index|
       puts "#{index + 1}. #{name}"
@@ -104,7 +132,10 @@ class Dockly::BuildCacheCommand < Dockly::AbstractCommand
 end
 
 class Dockly::Cli < Dockly::AbstractCommand
-  subcommand ['build', 'b'], 'Create package', Dockly::BuildCommand
+  subcommand ['build-or-copy-all'], 'Run build or copy all Rake task', Dockly::BuildOrCopyAllCommand
+  subcommand ['build', 'b'], 'Create deb package', Dockly::BuildDebCommand
+  subcommand ['build-deb', 'bd'], 'Create deb package', Dockly::BuildDebCommand
+  subcommand ['build-rpm', 'br'], 'Create RPM package', Dockly::BuildRpmCommand
   subcommand ['docker', 'd'], 'Generate docker image', Dockly::DockerCommand
   subcommand ['list', 'l'], 'List packages', Dockly::ListCommand
   subcommand ['build_cache', 'bc'], 'Build Cache commands', Dockly::BuildCacheCommand

data/lib/dockly/deb.rb

@@ -55,7 +55,8 @@ class Dockly::Deb
     Dockly.s3.copy_object(
       copy_source: File.join(s3_bucket, object),
       bucket: s3_bucket,
-      key: s3_object_name
+      key: s3_object_name,
+      acl: 'bucket-owner-full-control',
     )
     info "Successfully copied s3://#{s3_bucket}/#{object} to s3://#{s3_bucket}/#{s3_object_name}"
   end
@@ -76,12 +77,16 @@ class Dockly::Deb
   end
 
   def upload_to_s3
-    info "uploading to s3"
     return if s3_bucket.nil?
     raise "Package wasn't created!" unless File.exist?(build_path)
     info "uploading package to s3"
     File.open(build_path, 'rb') do |file|
-      Dockly.s3.put_object(bucket: s3_bucket, key: s3_object_name, body: file)
+      Dockly.s3.put_object(
+        bucket: s3_bucket,
+        key: s3_object_name,
+        body: file,
+        acl: 'bucket-owner-full-control',
+      )
     end
   end
 
@@ -120,7 +125,14 @@ private
     add_files(@dir_package)
     add_docker_auth_config(@dir_package)
     add_docker(@dir_package)
-    add_startup_script(@dir_package) if package_startup_script
+
+    if package_startup_script.is_a?(String)
+      raise ArgumentError,
+            'package_startup_script filename must not be empty if specified' if package_startup_script.empty?
+      add_startup_script(@dir_package, package_startup_script)
+    elsif package_startup_script
+      add_startup_script(@dir_package)
+    end
 
     convert_package
 
@@ -168,7 +180,7 @@ private
   end
 
   def add_docker_auth_config(package)
-    return if (registry = get_registry).nil? || !registry.authentication_required?
+    return if (registry = get_registry).nil? || !should_auth?(registry)
     info "adding docker config file"
     registry.generate_config_file!
 
@@ -179,11 +191,18 @@ private
     package.attributes[:prefix] = nil
   end
 
+  def should_auth?(registry)
+    registry.is_a?(Dockly::Docker::Registry) &&
+      registry.authentication_required?
+  end
+
   def add_docker(package)
     return if docker.nil? || docker.s3_bucket
     info "adding docker image"
     docker.generate!
-    return unless docker.registry.nil?
+
+    return if get_registry
+
     package.attributes[:prefix] = docker.package_dir
     Dir.chdir(File.dirname(docker.tar_path)) do
       package.input(File.basename(docker.tar_path))
@@ -192,7 +211,7 @@ private
   end
 
   def get_registry
-    if docker && registry = docker.registry
+    if docker && (registry = docker.registry)
       registry
     end
   end
@@ -201,38 +220,51 @@ private
     scripts = ["#!/bin/bash"]
     bb = Dockly::BashBuilder.new
     scripts << bb.normalize_for_dockly
-    if get_registry
-      scripts << bb.registry_import(docker.repo, docker.tag)
-    elsif docker
-      if docker.s3_bucket.nil?
-        docker_output = File.join(docker.package_dir, docker.export_filename)
-        if docker.tar_diff
-          scripts << bb.file_diff_docker_import(docker.import, docker_output, docker.name, docker.tag)
-        else
-          scripts << bb.file_docker_import(docker_output, docker.name, docker.tag)
+
+    if docker
+      if (registry = docker.registry)
+        if registry.is_a?(Dockly::Docker::ECR)
+          scripts << bb.auth_ecr(registry.server_address)
         end
+        scripts << bb.registry_import(docker.repo, docker.tag)
       else
-        if docker.tar_diff
-          scripts << bb.s3_diff_docker_import(docker.import, docker.s3_url, docker.name, docker.tag)
-        else
-          scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag)
-        end
+        scripts += collect_non_registry_scripts(bb)
       end
-      scripts << bb.docker_tag_latest(docker.repo, docker.tag)
     end
+
     scripts.join("\n")
   end
 
-  def add_startup_script(package)
+  def collect_non_registry_scripts(bb)
+    scripts = []
+
+    if docker.s3_bucket.nil?
+      docker_output = File.join(docker.package_dir, docker.export_filename)
+      if docker.tar_diff
+        scripts << bb.file_diff_docker_import(docker.import, docker_output, docker.name, docker.tag)
+      else
+        scripts << bb.file_docker_import(docker_output, docker.name, docker.tag)
+      end
+    else
+      if docker.tar_diff
+        scripts << bb.s3_diff_docker_import(docker.import, docker.s3_url, docker.name, docker.tag)
+      else
+        scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag)
+      end
+    end
+    scripts << bb.docker_tag_latest(docker.repo, docker.tag)
+  end
+
+  def add_startup_script(package, startup_script = "dockly-startup.sh")
     ensure_present! :build_dir
-    startup_script_path = File.join(build_dir, "dockly-startup.sh")
+    startup_script_path = File.join(build_dir, startup_script)
     File.open(startup_script_path, 'w+') do |f|
       f.write(post_startup_script)
       f.chmod(0755)
     end
     package.attributes[:prefix] = "/opt/dockly"
     Dir.chdir(build_dir) do
-      package.input("dockly-startup.sh")
+      package.input(startup_script)
     end
     package.attributes[:prefix] = nil
   end

data/lib/dockly/docker.rb

@@ -10,11 +10,13 @@ class Dockly::Docker
   include Dockly::Util::Logger::Mixin
 
   autoload :Registry, 'dockly/docker/registry'
+  autoload :ECR, 'dockly/docker/ecr'
 
   logger_prefix '[dockly docker]'
 
   dsl_class_attribute :build_cache, Dockly::BuildCache.model, type: Array
-  dsl_class_attribute :registry, Dockly::Docker::Registry
+  dsl_class_attribute :docker_registry, Dockly::Docker::Registry
+  dsl_class_attribute :ecr, Dockly::Docker::ECR
 
   dsl_attribute :name, :import, :git_archive, :build, :tag, :build_dir, :package_dir,
     :timeout, :cleanup_images, :tar_diff, :s3_bucket, :s3_object_prefix
@@ -32,6 +34,10 @@ class Dockly::Docker
     (@build_env ||= {}).tap { |env| env.merge!(hash) if hash.is_a?(Hash) }
   end
 
+  def registry
+    ecr || docker_registry
+  end
+
   def copy_from_s3(sha)
     return if s3_bucket.nil?
     object = s3_object_for(sha)
@@ -39,7 +45,8 @@ class Dockly::Docker
     Dockly.s3.copy_object(
       copy_source: File.join(s3_bucket, object),
       bucket: s3_bucket,
-      key: s3_object
+      key: s3_object,
+      acl: 'bucket-owner-full-control',
     )
     info "Successfully copied s3://#{s3_bucket}/#{object} to s3://#{s3_bucket}/#{s3_object}"
   end
@@ -176,7 +183,9 @@ class Dockly::Docker
     repo = "#{name}-base"
     tag = "dockly-#{Dockly::VERSION}-#{File.basename(import).split('.').first}"
     info "looking for imported base image with tag: #{tag}"
-    image = Docker::Image.all.find { |img| img.info['RepoTags'].include?("#{repo}:#{tag}") }
+    image = Docker::Image.all.find do |img|
+      img.info['RepoTags'] && img.info['RepoTags'].include?("#{repo}:#{tag}")
+    end
     if image
       info "found imported base image: #{image.id}"
       image
@@ -315,13 +324,21 @@ class Dockly::Docker
   end
 
   def push_to_registry(image)
-    ensure_present! :registry
+    raise "No registry to push to" if registry.nil?
+
     info "Exporting #{image.id} to Docker registry at #{registry.server_address}"
+
     registry.authenticate!
-    image = Docker::Image.all(:all => true).find { |img|
-      img.id.start_with?(image.id) || image.id.start_with?(img.id)
-    }
+
+    image =
+      Docker::Image
+        .all(:all => true)
+        .find do |img|
+          img.id.include?(image.id) || image.id.include?(img.id)
+        end
+
     raise "Could not find image after authentication" if image.nil?
+
     image.push(registry.to_h, :registry => registry.server_address)
   end
 

data/lib/dockly/docker/ecr.rb

@@ -0,0 +1,60 @@
+class Dockly::Docker::ECR
+  include Dockly::Util::DSL
+  include Dockly::Util::Logger::Mixin
+
+  logger_prefix '[dockly docker ecr]'
+
+  dsl_attribute :name, :server_address, :password, :username
+
+  def authenticate!
+    @username ||= login_from_aws[0]
+    @password ||= login_from_aws[1]
+
+    ensure_present! :password, :server_address, :username
+
+    debug "Attempting to authenticate at #{server_address}"
+
+    ::Docker.authenticate!(self.to_h)
+
+    info "Successfully authenticated at #{server_address}"
+  rescue ::Docker::Error::AuthenticationError
+    raise "Could not authenticate at #{server_address}"
+  end
+
+  def authentication_required?
+    true
+  end
+
+  def default_server_address?
+    false
+  end
+
+  def login_from_aws
+    @login_from_aws ||=
+      Base64
+        .decode64(auth_data.authorization_token)
+        .split(':')
+  end
+
+  def auth_data
+    @auth_data ||=
+      client
+        .get_authorization_token
+        .authorization_data
+        .first
+  end
+
+  def client
+    @client ||= Aws::ECR::Client.new(region: 'us-east-1')
+  end
+
+  def to_h
+    ensure_present! :username, :password, :server_address
+
+    {
+      'serveraddress' => "https://#{server_address}",
+      'username' => username,
+      'password' => password
+    }
+  end
+end

data/lib/dockly/rake_task.rb

@@ -34,7 +34,7 @@ namespace :dockly do
 
   task :load do
     raise "No #{Dockly.load_file} found!" unless File.exist?(Dockly.load_file)
-    Dockly.inst
+    Dockly.instance
   end
 
   task :assume_role => 'dockly:load' do

data/lib/dockly/s3_writer.rb

@@ -72,8 +72,11 @@ module Dockly
     end
 
     def multipart_upload
-      @multipart_upload ||=
-        connection.create_multipart_upload(bucket: s3_bucket, key: s3_object)
+      @multipart_upload ||= connection.create_multipart_upload(
+        bucket: s3_bucket,
+        key: s3_object,
+        acl: 'bucket-owner-full-control',
+      )
     end
   end
 end

data/lib/dockly/version.rb

@@ -1,7 +1,7 @@
 module Dockly
-  MAJOR = 3
-  MINOR = 1
-  PATCH = 1
+  MAJOR = 4
+  MINOR = 0
+  PATCH = 0
   RELEASE = nil
 
   VERSION = [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')

data/snippets/auth_ecr.erb

@@ -0,0 +1,11 @@
+auth_ecr() {
+  $(aws ecr get-login --region us-east-1 --no-include-email)
+}
+
+worked=1
+for attempt in {1..10}; do
+  [[ $worked != 0 ]] || break
+  auth_ecr && worked=0 || (log "ecr auth: attempt $attempt failed, sleeping 30"; sleep 30)
+done
+[[ $worked != 0 ]] && fatal "failed to auth to ecr"
+log "ecr auth: successfully authenticated"

data/spec/dockly/build_cache/docker_spec.rb

@@ -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{1,2}-\w+\Z/)
+        expect(build_cache.parameter_output(command)).to match(/\A\d.\d.\d+-\w+-\w+\z/)
       end
     end
 

data/spec/dockly/deb_spec.rb

@@ -175,6 +175,25 @@ describe Dockly::Deb do
         expect(`dpkg --contents #{filename}`).to_not include("dockly-startup.sh")
       end
     end
+
+    context 'when package_startup_script is a string' do
+      context 'when the string is empty' do
+        before { subject.package_startup_script('') }
+
+        it 'does not place a startup script with the provided name in the package' do
+          expect{subject.create_package!}.to raise_error(ArgumentError)
+        end
+      end
+
+      context 'when the string is not empty' do
+        before { subject.package_startup_script('special-startup.sh') }
+
+        it 'places a startup script with the provided name in the package' do
+          subject.create_package!
+          expect(`dpkg --contents #{filename}`).to include("special-startup.sh")
+        end
+      end
+    end
   end
 
   describe '#exists?' do

data/spec/dockly/docker/ecr_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Dockly::Docker::ECR do
+  subject do
+    described_class.new(name: 'ecr', server_address: registry)
+  end
+
+  let(:username) { 'AWS' }
+  let(:password) { 'password' }
+  let(:registry) { 'accountid.dkr.ecr.region.amazonaws.com' }
+  let(:endpoint) { "https://#{registry}" }
+  let(:ecr_client) { Aws::ECR::Client.new(stub_responses: true) }
+
+  after do
+    Aws.config[:ecr] = { stub_responses: {} }
+  end
+
+  describe '#authenticate!' do
+    context 'when AWS provides a username and password for ECR' do
+      before do
+        Aws.config[:ecr] = {
+          stub_responses: {
+            get_authorization_token: {
+              authorization_data: [
+                {
+                  authorization_token: Base64.encode64("#{username}:#{password}"),
+                  proxy_endpoint: endpoint
+                }
+              ]
+            }
+          }
+        }
+      end
+
+      context 'and docker auth succeeds' do
+        before do
+          allow(::Docker)
+            .to receive(:authenticate!)
+            .with({
+              'serveraddress' => endpoint,
+              'username' => username,
+              'password' => password
+            })
+        end
+
+        it 'does not error' do
+          expect { subject.authenticate! }.to_not raise_error
+        end
+      end
+
+      context 'and docker auth raises and error' do
+        before do
+          allow(::Docker)
+            .to receive(:authenticate!)
+            .and_raise(::Docker::Error::AuthenticationError)
+        end
+
+        it 'raises' do
+          expect { subject.authenticate! }
+            .to raise_error(/Could not authenticate/)
+        end
+      end
+    end
+  end
+
+  context 'when it is unable to get auth from AWS' do
+    before do
+      Aws.config[:ecr] = {
+        stub_responses: {
+          get_authorization_token: ->(_context) { raise 'Unable to get token' }
+        }
+      }
+    end
+
+    it 'raises' do
+      expect(::Docker).not_to receive(:authenticate!)
+      expect { subject.authenticate! }.to raise_error
+    end
+  end
+end

data/spec/dockly/docker_spec.rb

@@ -3,6 +3,76 @@ require 'spec_helper'
 describe Dockly::Docker do
   subject { described_class.new(:name => :test_docker) }
 
+  describe '#registry' do
+    context 'when there is no registry' do
+      it 'returns nil' do
+        expect(subject.registry).to eq(nil)
+      end
+    end
+
+    context 'when there is only an ecr registry' do
+      subject do
+        Dockly::Docker.new do
+          ecr { server_address 'accountid.dkr.ecr.region.amazonaws.com' }
+        end
+      end
+
+      it 'returns an ecr registry' do
+        registry = subject.registry
+
+        expect(registry).not_to eq(nil)
+        expect(registry).to be_a(Dockly::Docker::ECR)
+        expect(registry.server_address)
+          .to eq('accountid.dkr.ecr.region.amazonaws.com')
+      end
+    end
+
+    context 'when there is a docker registry' do
+      context 'and an ecr registry' do
+        subject do
+          Dockly::Docker.new do
+            registry do
+              username ENV['DOCKER_USER']
+              email ENV['DOCKER_EMAIL']
+              password ENV['DOCKER_PASS']
+            end
+
+            ecr { server_address 'accountid.dkr.ecr.region.amazonaws.com' }
+          end
+        end
+
+        it 'prefers the ecr registry' do
+          registry = subject.registry
+
+          expect(registry).not_to eq(nil)
+          expect(registry).to be_a(Dockly::Docker::ECR)
+          expect(registry.server_address)
+            .to eq('accountid.dkr.ecr.region.amazonaws.com')
+        end
+      end
+
+      context 'and only a docker registry' do
+        subject do
+          Dockly::Docker.new do
+            registry do
+              username ENV['DOCKER_USER']
+              email ENV['DOCKER_EMAIL']
+              password ENV['DOCKER_PASS']
+            end
+          end
+
+          it 'returns the docker registry' do
+            registry = subject.registry
+
+            expect(registry).not_to eq(nil)
+            expect(registry).to be_a(Dockly::Docker::Registry)
+            expect(registry.username).to eq(ENV['DOCKER_USER'])
+          end
+        end
+      end
+    end
+  end
+
   describe '#ensure_tar' do
     let(:action) { subject.ensure_tar(file) }
 
@@ -147,7 +217,7 @@ describe Dockly::Docker do
       end
 
       context 'and it points to a non-S3 url' do
-        let(:url) { 'http://www.html5zombo.com' }
+        let(:url) { 'http://html5zombo.com' }
 
        before { subject.tag 'yolo' }
 
@@ -172,7 +242,7 @@ describe Dockly::Docker do
     context "with a registry export" do
       let(:registry) { double(:registry) }
       before do
-        subject.instance_variable_set(:"@registry", registry)
+        subject.instance_variable_set(:"@docker_registry", registry)
         expect(subject).to receive(:push_to_registry)
       end
 

data/spec/dockly/foreman_spec.rb

@@ -29,9 +29,9 @@ describe Dockly::Foreman do
         subject.create!
         File.exist?('build/foreman/foreman.target').should be_true
         File.exist?('build/foreman/foreman-web.target').should be_true
-        File.exist?('build/foreman/foreman-web-1.service').should be_true
-        File.read('build/foreman/foreman-web-1.service')
-            .lines.grep(/^ExecStart=\/bin\/bash -lc '\/bin\/sh start_my_server'$/)
+        File.exist?('build/foreman/foreman-web@.service').should be_true
+        File.open('build/foreman/foreman-web@.service')
+            .grep(/^ExecStart=\/bin\/bash -lc 'exec \/bin\/sh start_my_server'$/)
             .length.should == 1
       end
     end

metadata

@@ -1,217 +1,231 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Swipely, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: minigit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 description: Packaging made easy
 email:
 - tomhulihan@swipely.com
@@ -222,11 +236,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -243,6 +257,7 @@ files:
 - lib/dockly/cli.rb
 - lib/dockly/deb.rb
 - lib/dockly/docker.rb
+- lib/dockly/docker/ecr.rb
 - lib/dockly/docker/registry.rb
 - lib/dockly/foreman.rb
 - lib/dockly/history.rb
@@ -255,6 +270,7 @@ files:
 - lib/dockly/version.rb
 - lib/foreman/cli_fix.rb
 - lib/foreman/export/base_fix.rb
+- snippets/auth_ecr.erb
 - snippets/docker_tag_latest.erb
 - snippets/file_diff_docker_import.erb
 - snippets/file_docker_import.erb
@@ -272,6 +288,7 @@ files:
 - spec/dockly/build_cache/local_spec.rb
 - spec/dockly/cli_spec.rb
 - spec/dockly/deb_spec.rb
+- spec/dockly/docker/ecr_spec.rb
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb
@@ -294,24 +311,23 @@ homepage: https://github.com/swipely/dockly
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Packaging made easy
 test_files:
@@ -321,6 +337,7 @@ test_files:
 - spec/dockly/build_cache/local_spec.rb
 - spec/dockly/cli_spec.rb
 - spec/dockly/deb_spec.rb
+- spec/dockly/docker/ecr_spec.rb
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb