builderator 1.2.2 → 1.2.3.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6783dc56369ee7edcd63e06afb7b6a0cf07e0c4b
-  data.tar.gz: e2aa20916ffd711e7a4231fe1b27276670241b91
+  metadata.gz: 83b75ce26deeb6612ec531be9a548b2b5c43f412
+  data.tar.gz: 1622ca8922bb3596167b1341d3f170ec3feba4e5
 SHA512:
-  metadata.gz: dc6a8c4e53d14f73a828d43c1cd254fc4d00579b974e60e658bac84915a6dcddb3eaff7038b51702bfa5860bdd757e1c7e821f5f7cddad6339b6f8d5965ff85b
-  data.tar.gz: 75b80cbbac9da94f87285b8c4056cd8bb3d8f7aa62a69aa6b8cd40aa89e340d08b31e8e04152e859499366a69af9c2eef32886bcd1df603c666c8e7b6a458a97
+  metadata.gz: 16cc1d59457a54b2b86e6ae401b1d870fbb768ae3d61aae10a024a1da7927ef444d7721f1423edef5fa6fe9099ef2159c317766340f02a23d827bc7bf6783203
+  data.tar.gz: 6d1e30012ec43092c5cd1c3bdab195b1fdc4f6776840367c4b97dbdd7e2630dac6e4a3bc35467f18f25a19c53a6b3b8440e156184fe417619819c0f593b327c0

data/lib/builderator/config/attributes.rb

@@ -23,7 +23,10 @@ module Builderator
               ## Instantiate List if it doesn't exist yet. `||=` will always return a new Rash.
               @attributes[attribute_name] = Config::List.new(run_options) unless @attributes.has?(attribute_name, Config::List)
 
-              @attributes[attribute_name].set(*arg.flatten) unless arg.empty?
+              unless arg.empty?
+                @attributes[attribute_name].set(*arg.flatten)
+                @attributes[attribute_name].set(*arg) if options[:flatten] == false
+              end
               @attributes[attribute_name]
             end
 

data/lib/builderator/config/defaults.rb

@@ -80,6 +80,16 @@ module Builderator
         end
       end
 
+      profile :docker do |profile|
+        profile.log_level :info
+
+        profile.packer do |packer|
+          packer.build :docker do |build|
+            build.type 'docker'
+          end
+        end
+      end
+
       cleaner do |cleaner|
         cleaner.commit false
         cleaner.force false

data/lib/builderator/config/file.rb

@@ -191,15 +191,46 @@ module Builderator
           attribute :binary_env
         end
 
+        collection :provisioner do
+          attribute :inline, :type => :list
+          attribute :environment_vars, :type => :list
+        end
+
         ##
         # Packerfile
         #
-        # This currently supports the AWS/EC2 builder.
+        # This currently supports the AWS/EC2 and Docker builders.
         ##
         namespace :packer do
           collection :build do
             attribute :type
 
+            ## Docker-specific attributes
+            # Required
+            attribute :image
+            # One (and only one) of the following is required
+            attribute :commit
+            attribute :discard
+            attribute :export_path
+
+            # Optional attributes
+            attribute :author
+            attribute :aws_access_key
+            attribute :aws_secret_key
+            attribute :aws_token
+            attribute :changes, :type => :list
+            attribute :ecr_login
+            attribute :login
+            attribute :login_email
+            attribute :login_username
+            attribute :login_password
+            attribute :login_server
+            attribute :message
+            attribute :privileged
+            attribute :pull
+            attribute :run_command, :type => :list
+            attribute :volumes, :type => :hash
+
             ## EC2 Placement and Virtualization parameters
             attribute :region
             attribute :availability_zone
@@ -234,6 +265,8 @@ module Builderator
             ## Assumable role for tagging AMIs in remote accounts
             attribute :tagging_role
           end
+
+          attribute :post_processors, :type => :list, :flatten => false
         end
 
         ##

data/lib/builderator/control/data.rb

@@ -14,3 +14,4 @@ module Builderator
 end
 
 require_relative './data/image'
+require_relative './data/ecr'

data/lib/builderator/control/data/ecr.rb

@@ -0,0 +1,40 @@
+require 'aws-sdk'
+require 'date'
+
+require_relative '../../util'
+
+module Builderator
+  module Control
+    # :nodoc:
+    module Data
+      # Lookup ECR repository info
+      #
+      # NB. We want to embed the login_server info into the returned repo data for
+      # ease of use. Thus, instead of an AWS struct-type, we get a hash with the
+      # injected value.
+      def self.repository(query = {})
+        ECR.search(query).map do |repo|
+          repo.to_h.tap { |r| r[:login_server] = "https://#{repo.repository_uri.sub(repo.repository_name, '')}" }
+          end
+        end
+      end
+
+      ##
+      # Find ECR repositories for sources
+      ##
+      module ECR
+        class << self
+          def search(query = {})
+            options = {}
+
+            options['repository_names'] = Util.to_array(query.delete('name')) if query.include?('name')
+            options['registry_id'] = query.delete('owner') if query.include?('owner')
+
+            Util.ecr.describe_repositories(options)
+              .each_with_object([]) { |page, repositories| repositories.push(*page.repositories) }
+              .sort { |a, b| a.repository_name <=> b.repository_name }
+          end
+        end
+      end
+    end
+end

data/lib/builderator/interface/packer.rb

@@ -19,13 +19,27 @@ module Builderator
       def initialize(*_)
         super
 
+        docker_builders = Config.profile.current.packer.build.select do |_, builder|
+          builder.to_h[:type] == 'docker'
+        end
+
         @packerfile ||= {
           :builders => [],
-          :provisioners => []
+          :provisioners => [],
+          'post-processors' => []
         }.tap do |json|
           Config.profile.current.packer.build.each do |_, build|
             build_hash = build.to_hash.tap do |b|
-              b[:tags] = Config.profile.current.tags
+              b[:tags] = Config.profile.current.tags unless Config.profile.current.tags.empty?
+            end
+
+            if build_hash[:type] == 'docker'
+              raise 'The Docker builder requires a base image' unless build_hash.key?(:image)
+
+              # The Docker builder requires one and only one of 'commit', 'discard', or 'export_path' set
+              if build_hash.keys.select { |k| [:commit, :discard, :export_path].include?(k) }.length != 1
+                raise 'The Docker builder requires one and only one of `commit`, `discard`, or `export_path` attributes to be defined'
+              end
             end
 
             # If we specify encrypted boot, packer won't allow ami_users.
@@ -49,16 +63,41 @@ module Builderator
             json[:builders] << build_hash
           end
 
-          ## Initialize the staging directory
+          # post_processors must be a List of Rashes.
+          post_processors = Config.profile.current.packer.post_processors.to_a
+          json['post-processors'] = post_processors.first unless post_processors.empty?
+          json.delete('post-processors') if json['post-processors'].compact.empty?
+
+          ## Initialize the staging directory unless using the docker builder
           json[:provisioners] << {
             :type => 'shell',
             :inline => "sudo mkdir -p #{Config.chef.staging_directory}/cache && "\
                        "sudo chown $(whoami) -R #{Config.chef.staging_directory}"
-          }
-        end
+          } if docker_builders.empty?
+
+          # Only add artifact provisioners if they're defined
+          Config.profile.current.artifact.each do |_, artifact|
+            json[:provisioners] << _artifact_provisioner(artifact)
+          end unless Config.profile.current.artifact.attributes.empty?
+
+          # Only add chef provisioners if they're defined
+          unless Config.profile.current.chef.attributes.empty?
+            # There are certain options (staging directory, run as sudo) that don't apply
+            # to the docker builder.
+            json[:provisioners] << if docker_builders.empty?
+                                     _chef_provisioner
+                                   else
+                                     _chef_provisioner_docker
+                                   end
+          end
+
+          # After adding the default provisioners, we add any additional ones to the provisioners array
+          Config.profile.current.provisioner.each do |name, provisioner|
+            json[:provisioners] << provisioner.attributes.tap { |p| p[:type] = name.to_s }
+          end
 
-        _artifact_provisioners
-        _chef_provisioner
+          json.delete(:provisioners) if json[:provisioners].empty?
+        end
       end
 
       def render
@@ -68,18 +107,30 @@ module Builderator
       private
 
       ## Upload artifacts to the build container
-      def _artifact_provisioners
-        Config.profile.current.artifact.each do |_, artifact|
-          packerfile[:provisioners] << {
+      def _artifact_provisioner(artifact)
+        {
             :type => 'file',
             :source => artifact.path,
             :destination => artifact.destination
-          }
-        end
+        }
       end
 
       def _chef_provisioner
-        packerfile[:provisioners] << {
+        _chef_provisioner_base.merge(
+          :staging_directory => Config.chef.staging_directory,
+          :install_command => _chef_install_command
+        )
+      end
+
+      def _chef_provisioner_docker
+        _chef_provisioner_base.merge(
+          :prevent_sudo => true,
+          :install_command => _chef_install_command(false)
+        )
+      end
+
+      def _chef_provisioner_base
+        {
           :type => 'chef-solo',
           :run_list => Config.profile.current.chef.run_list,
           :cookbook_paths => Config.local.cookbook_path,
@@ -87,10 +138,13 @@ module Builderator
           :environments_path => Config.local.environment_path,
           :chef_environment => Config.profile.current.chef.environment,
           :json => Config.profile.current.chef.node_attrs,
-          :staging_directory => Config.chef.staging_directory,
-          :install_command => "curl -L https://www.chef.io/chef/install.sh | sudo bash -s -- -v #{Config.chef.version}"
         }
       end
+
+      def _chef_install_command(sudo = true)
+        template = sudo ? 'sudo' : ''
+        format("curl -L https://www.chef.io/chef/install.sh | %s bash -s -- -v #{Config.chef.version}", template)
+      end
     end
   end
 end

data/lib/builderator/tasks.rb

@@ -82,6 +82,14 @@ module Builderator
         invoke Tasks::Packer, :remote_tag, [profile], options if options['remote_tag']
       end
 
+      desc 'container [PROFILE = docker]', 'Build a container of PROFILE'
+      method_option :debug, :type => :boolean
+      def container(profile = :docker)
+        prepare
+
+        invoke Tasks::Packer, :build, [profile], options
+      end
+
       # desc 'cookbook SUBCOMMAND', 'Cookbook tasks'
       # subcommand 'cookbook', Tasks::Cookbook
 

data/lib/builderator/util.rb

@@ -71,6 +71,10 @@ module Builderator
         end
       end
 
+      def ecr(region = Config.aws.region)
+        clients["ecr-#{region}"] ||= Aws::ECR::Client.new(:region => region)
+      end
+
       def asg(region = Config.aws.region)
         clients["asg-#{region}"] ||= Aws::AutoScaling::Client.new(:region => region)
       end

data/template/Vagrantfile.erb

@@ -94,4 +94,16 @@ Vagrant.configure('2') do |config|
     ## Tell Chef that this is a Vagrant build
     chef.json[:vagrant] = true
   end
+
+<%- profile.current.provisioner.each do |name, provisioner| -%>
+    <%- provisioner.each do |func, val| -%>
+        <%- if val.is_a?(Array) -%>
+          <%- val.each do |v| -%>
+  config.vm.provision "<%= name %>", <%= func %>: "<%= v %>"
+          <%- end -%>
+        <%- else -%>
+  config.vm.provision "<%= name %>", <%= func %>: "<%= val %>"
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3.pre.beta.1
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -205,6 +205,7 @@ files:
 - lib/builderator/control/cleaner.rb
 - lib/builderator/control/cookbook.rb
 - lib/builderator/control/data.rb
+- lib/builderator/control/data/ecr.rb
 - lib/builderator/control/data/image.rb
 - lib/builderator/control/version.rb
 - lib/builderator/control/version/auto.rb
@@ -259,12 +260,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Tools to make CI Packer builds awesome