linecook-gem 0.7.28 → 0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e413a2e2ec8ce58d8c7fde9d9afdeb71d8810582
-  data.tar.gz: d8fdaf376b5b9eb91981e3a849614430261ea8ba
+  metadata.gz: 617b8b12b9c62eef6319df894542e2d3289e3fa7
+  data.tar.gz: d13c1fb336d86b22d6178b65e4debc747d3809e1
 SHA512:
-  metadata.gz: 97eb01613ffa7720947736573252a85f6613b114b9514d8c05ca643e78214f990fb94a490ad606454bcff52f2e3ee8c2ed2159a32248f958c1c5d3193de986af
-  data.tar.gz: 0fae50c55a20d434114db047f427d3ccc40b2e3618f9e7d1e601c2e4e990c820c64f6178e225d7425e25b0460de13b0841bd84190f4b32105e6d7766d49aff6c
+  metadata.gz: 79e827a474f67b01a23dd31c6d641021c68eb6bc251a1d453e92aa0dbbefd009fe0d912841280c979714b78147b1a103dfa0cbf3aa5007f420102b57633963f5
+  data.tar.gz: 86232a32f22ecb61c9fee1f7b04984dd82dbf67f4e339d2aa79640823c0d40305d090a5abd2e12c49318debdfbf27e75da78359a5060aa75789fc1d4f6f8ee77

data/lib/linecook-gem/baker.rb

@@ -4,6 +4,7 @@ require 'kitchen'
 require 'kitchen/command/test'
 
 require 'linecook-gem/image'
+require 'linecook-gem/util/common'
 require 'linecook-gem/baker/docker'
 
 module Linecook
@@ -13,12 +14,9 @@ module Linecook
       def initialize(image, directory: nil)
         @directory = File.expand_path(directory || Dir.pwd)
         @image = image
-
-        Dir.chdir(@directory) do
-          load_config
-          munge_config
-          @driver = driver
-        end
+        @config = load_config
+        munge_config
+        @driver = driver
 
       end
 
@@ -81,21 +79,6 @@ module Linecook
         end
       end
 
-      def load_config
-        @config ||= begin
-
-          Kitchen::Config.new(
-            kitchen_root: @directory,
-            loader: Kitchen::Loader::YAML.new(
-              project_config: ENV['KITCHEN_YAML'] || File.join(@directory, '.kitchen.yml'),
-              local_config: ENV['KITCHEN_LOCAL_YAML'],
-              global_config: ENV['KITCHEN_GLOBAL_YAML']
-            )
-          )
-
-        end
-      end
-
       def munge_config
         data = @config.send(:data).instance_variable_get(:@data)
         @is_chef = data[:provisioner][:name] =~ /chef/

data/lib/linecook-gem/cli.rb

@@ -50,13 +50,14 @@ class Image < Thor
 
   desc 'package', 'Package image'
   method_option :name, type: :string, required: true, banner: 'NAME', desc: 'Name of the image to package.', aliases: '-n'
+  method_option :directory, type: :string, required: false, banner: 'DIR', desc: 'Directory containing kitchen files', aliases: '-d'
   method_option :tag, type: :string, default: 'latest', banner: 'NAME', desc: 'Tag of the image to package.', aliases: '-t'
   method_option :group, type: :string, required: false, banner: 'ID', desc: 'Group of image to package', aliases: '-g'
   method_option :strategy, type: :string, default: 'packer', banner: 'STRATEGY', enum: ['packer', 'squashfs'], desc: 'Packaging strategy', aliases: '-s'
   def package
     opts = options.symbolize_keys
     image = Linecook::Image.new(opts[:name], opts[:group], opts[:tag])
-    Linecook::Packager.package(image, name: opts[:strategy])
+    Linecook::Packager.package(image, name: opts[:strategy], directory: opts[:directory])
   end
 
   desc 'save', 'Save running build'

data/lib/linecook-gem/packager.rb

@@ -9,9 +9,9 @@ module Linecook
   module Packager
     extend self
 
-    def package(image, name: 'packer')
+    def package(image, name: 'packer', directory: nil)
       image.fetch
-      provider(name.to_sym).package(image)
+      provider(name.to_sym).package(image, directory)
     end
 
   private

data/lib/linecook-gem/packager/packer.rb

@@ -9,6 +9,7 @@ require 'pty'
 require 'linecook-gem/image'
 require 'linecook-gem/util/downloader'
 require 'linecook-gem/util/locking'
+require 'linecook-gem/util/common'
 require 'linecook-gem/packager/route53'
 
 module Linecook
@@ -21,44 +22,44 @@ module Linecook
     PACKER_VERSION = '0.12.0'
     PACKER_PATH = File.join(Linecook::Config::LINECOOK_HOME, 'bin', 'packer')
 
+    PRE_MOUNT_COMMANDS = [
+      'parted -s {{.Device}} mklabel msdos',
+      'parted -s {{.Device}} mkpart primary ext2 0% 100%',
+      'mkfs.ext4 {{.Device}}1',
+      'tune2fs -L cloudimg-rootfs {{.Device}}1',
+    ]
+
+    POST_MOUNT_COMMANDS = [
+      'tar -C {{.MountPath}} -xpf {{ user `source_image_path` }}',
+      'cp /etc/resolv.conf {{.MountPath}}/etc',
+      'echo "LABEL=cloudimg-rootfs   /        ext4   defaults,discard        0 0" > {{.MountPath}}/etc/fstab',
+      'grub-install --root-directory={{.MountPath}} {{.Device}}',
+      'rm -rf {{.MountPath}}/etc/network',
+      'cp -r /etc/network {{.MountPath}}/etc/',
+    ]
+
+    ROOT_DEVICE_MAP = {
+      device_name: 'xvda',
+      delete_on_termination: true
+    }
+
     BUILDER_CONFIG = {
       type: 'amazon-chroot',
       access_key: '{{ user `aws_access_key` }}',
       secret_key: '{{ user `aws_secret_key` }}',
-      source_ami: "{{user `source_ami`}}",
       ami_name: 'packer-image.{{ user `image_name` }} {{timestamp}}',
-      device_path: '/dev/{{ user `ebs_device` }}'
+      from_scratch: true,
+      root_device_name: ROOT_DEVICE_MAP[:device_name],
+      ami_block_device_mappings: [ ROOT_DEVICE_MAP ],
+      pre_mount_commands: PRE_MOUNT_COMMANDS,
+      post_mount_commands: POST_MOUNT_COMMANDS,
     }.freeze
 
-    PROVISIONER_COMMANDS = [
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/proc/sys/fs/binfmt_misc',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/proc',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/sys',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/dev/pts',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/dev',
-      'mv /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc/network /tmp/{{ user `ebs_device`}}-network',
-      'umount /dev/{{ user `ebs_device` }}1',
-      'mkfs.ext4 /dev/{{ user `ebs_device` }}1',
-      'tune2fs -L cloudimg-rootfs /dev/{{ user `ebs_device` }}1',
-      'mkdir -p /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}',
-      'mount /dev/{{ user `ebs_device` }}1 /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}',
-      'tar -C /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }} -xpf {{ user `source_image_path` }}',
-      'cp /etc/resolv.conf /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc',
-      'echo "LABEL=cloudimg-rootfs   /        ext4   defaults,discard        0 0" > /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc/fstab',
-      'mount -t proc none /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/proc',
-      'mount -o bind /sys /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/sys',
-      'mount -o bind /dev /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/dev',
-      # Sadly we need to install grub inside the image, and this implementation is Ubunut specific. This can be patched eventually when needed
-      'chroot /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }} apt-get update',
-      'chroot /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }} apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y --force-yes --no-upgrade install grub-pc grub-legacy-ec2',
-      'chroot /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }} update-grub',
-      'grub-install --root-directory=/mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }} /dev/{{ user `ebs_device` }}',
-      'rm -rf /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc/network',
-      'mv /tmp/{{ user `ebs_device`}}-network /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc/network',
-      'rm -f /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/etc/init/fake-container-events.conf', # HACK
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/proc',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/sys',
-      'umount /mnt/packer-amazon-chroot-volumes/{{ user `ebs_device` }}/dev'
+    CHROOT_COMMANDS = [
+      'apt-get update',
+      'apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y --force-yes --no-upgrade install grub-pc grub-legacy-ec2',
+      'update-grub',
+      'rm -f /etc/init/fake-container-events.conf', # HACK
     ]
 
     def initialize(config)
@@ -68,14 +69,18 @@ module Linecook
       @region = config[:region] || 'us-east-1'
       @copy_regions = config[:copy_regions] || []
       @accounts = config[:account_ids] || []
-      @source_ami = config[:source_ami] || find_ami
       @write_txt = Linecook.config[:packager] && Linecook.config[:packager][:ami] && Linecook.config[:packager][:ami][:update_txt]
     end
 
-    def package(image)
+    def package(image, directory)
       @image = image
+      kitchen_config = load_config(directory).send(:data).instance_variable_get(:@data)
+      image_config = kitchen_config[:suites].find{ |x| x[:name] == image.name }
+      if image_config && image_config[:packager]
+        packager = image_config[:packager] || {}
+      end
       conf_file = Tempfile.new("#{@image.id}-packer.json")
-      config = generate_config
+      config = generate_config(packager)
       conf_file.write(config)
       conf_file.close
       output = []
@@ -111,13 +116,12 @@ module Linecook
     #    amis = `grep "amazon-ebs,artifact,0,id" packer.log`.chomp.split(',')[5].split('%!(PACKER_COMMA)')
     # route53 TXT record integration
 
-    def generate_config
+    def generate_config(packager)
+      packager ||= {}
       config = {
         variables: {
           aws_access_key: Linecook.config[:aws][:access_key],
           aws_secret_key: Linecook.config[:aws][:secret_key],
-          ebs_device: free_device,
-          source_ami: @source_ami,
           image_name: "linecook-#{@image.id}",
           source_image_path: @image.path
         },
@@ -127,22 +131,24 @@ module Linecook
             ami_regions: @copy_regions,
             ami_virtualization_type: virt_type,
             root_volume_size: @root_size
-          )
+          ).deep_merge(packager[:builder] || {})
         ],
-        provisioners: build_provisioner(PROVISIONER_COMMANDS)
+        provisioners: build_provisioner(CHROOT_COMMANDS)
       }
+
+      unless config[:builders].first[:ami_block_device_mappings].find { |x| x[:device_name] == ROOT_DEVICE_MAP[:device_name] }
+        config[:builders].first[:ami_block_device_mappings].prepend ROOT_DEVICE_MAP
+      end
       JSON.pretty_generate(config)
     end
 
-    def build_provisioner(commands)
-      provisioner = []
-      commands.each do |cmd|
-        provisioner << {
-          type: 'shell-local',
-          command: cmd
+    def build_provisioner(chroot_commands)
+      provisioner = [
+        {
+          type: 'shell',
+          inline: chroot_commands
         }
-      end
-      provisioner
+      ]
     end
 
     def packer_path
@@ -168,39 +174,6 @@ module Linecook
       PACKER_PATH
     end
 
-    def free_device
-      lock('device_scan')
-      free = nil
-      prefix = device_prefix
-      ('f'..'zzz').to_a.each do |suffix|
-        device = "#{prefix}#{suffix}"
-        if free_device?(device)
-          lock(device)
-          at_exit do
-            clear_lock(device)
-          end
-          free = device
-          break
-        end
-      end
-      unlock('device_scan')
-      return free
-    end
-
-    def free_device?(device)
-      !File.exists?("/dev/#{device}") && !File.exists?(lock_path(device))
-    end
-
-    def device_prefix
-      prefixes = ['xvd']
-      `sudo ls -1 /sys/block`.lines.each do |dev| # FIXME
-        prefixes.each do |prefix|
-          return prefix if dev =~ /^#{prefix}/
-        end
-      end
-      return prefixes.first
-    end
-
     def extract_amis_from_output(output)
       amis = output.grep(/amazon-chroot,artifact,0,id/).first.chomp.split(',')[5].split('%!(PACKER_COMMA)')
       amis.each do |info_str|
@@ -216,15 +189,5 @@ module Linecook
       @hvm ? 'hvm' : 'paravirtual'
     end
 
-    def find_ami
-      url = "http://uec-images.ubuntu.com/query/trusty/server/released.current.txt"
-      data = open(url).read.split("\n").map{|l| l.split}.detect do |ary|
-        ary[4] == 'ebs' &&
-          ary[5] == 'amd64' &&
-          ary[6] == @region &&
-          ary.last == virt_type
-      end
-      data[7]
-    end
   end
 end

data/lib/linecook-gem/util/common.rb

@@ -1,3 +1,23 @@
+require 'kitchen'
+
+def load_config(directory)
+  @config ||= begin
+    Dir.chdir(directory) do
+      Kitchen::Config.new(
+        kitchen_root: Dir.pwd,
+        loader: Kitchen::Loader::YAML.new(
+          project_config: ENV['KITCHEN_YAML'] || File.join(Dir.pwd, '.kitchen.yml'),
+          local_config: ENV['KITCHEN_LOCAL_YAML'],
+          global_config: ENV['KITCHEN_GLOBAL_YAML']
+        )
+      )
+
+    end
+  end
+end
+
+
+
 def with_retries(retries, sleep_duration: 5, &block)
   attempts = 0
   while attempts < retries

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.7.28'
+  VERSION = '0.7.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.7.28
+  version: 0.7.29
 platform: ruby
 authors:
 - Dale Hamel