boxgrinder-build 0.3.7 → 0.3.8

data/bin/boxgrinder-build

@@ -26,7 +26,7 @@ require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.10'
+gem 'boxgrinder-core', '>= 0.0.11'
 gem 'aws-s3', '>= 0.6.2'
 gem 'amazon-ec2', '>= 0.9.6'
 gem 'net-sftp', '>= 2.0.4'
@@ -40,7 +40,7 @@ gem 'commander', '>= 4.0.3'
 #$stderr.reopen('/dev/null')
 
 program :name, 'BoxGrinder Build'
-program :version, '0.3.7'
+program :version, '0.3.8'
 program :description, 'A tool for building VM images from simple definition files.'
 default_command :build
 

data/lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb

@@ -98,7 +98,7 @@ module BoxGrinder
         when :cloudfront
           upload_to_bucket(deliverables, :public_read)
         when :ami
-          validate_plugin_config(['cert_file', 'key_file'])
+          validate_plugin_config(['cert_file', 'key_file', 'account_number'])
 
           unless AMI_OSES[@appliance_config.os.name].include?(@appliance_config.os.version)
             @log.error "You cannot convert selected image to AMI because of unsupported operating system: #{@appliance_config.os.name} #{@appliance_config.os.version}. Supported systems: #{supported_os}."

data/lib/boxgrinder-build/plugins/os/base/rpm-based-os-plugin.rb

@@ -47,10 +47,15 @@ module BoxGrinder
       @exec_helper.execute "sudo chmod 666 #{@deliverables[:metadata][:descriptor]}"
 
       customize( @deliverables[:disk] ) do |guestfs, guestfs_helper|
+        # TODO is this really needed?
+        @log.debug "Uploading '/etc/resolv.conf'..."
+        guestfs.upload( "/etc/resolv.conf", "/etc/resolv.conf" )
+        @log.debug "'/etc/resolv.conf' uploaded."
+
         @log.info "Executing post operations after build..."
 
-        if @appliance_config.post.base.size > 0
-          @appliance_config.post.base.each do |cmd|
+        unless @appliance_config.post['base'].nil?
+          @appliance_config.post['base'].each do |cmd|
             @log.debug "Executing #{cmd}"
             guestfs.sh( cmd )
           end

data/lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb

@@ -112,6 +112,11 @@ module BoxGrinder
       umount_image(@deliverables[:disk], ec2_disk_mount_dir, ec2_mounts)
 
       customize(@deliverables[:disk]) do |guestfs, guestfs_helper|
+        # TODO is this really needed?
+        @log.debug "Uploading '/etc/resolv.conf'..."
+        guestfs.upload( "/etc/resolv.conf", "/etc/resolv.conf" )
+        @log.debug "'/etc/resolv.conf' uploaded."
+
         create_devices(guestfs)
         upload_fstab(guestfs)
 
@@ -125,6 +130,16 @@ module BoxGrinder
         install_additional_packages(guestfs)
         change_configuration(guestfs)
 
+        unless @appliance_config.post['ec2'].nil?
+          @appliance_config.post['ec2'].each do |cmd|
+            @log.debug "Executing #{cmd}"
+            guestfs.sh( cmd )
+          end
+          @log.debug "Post commands from appliance definition file executed."
+        else
+          @log.debug "No commands specified, skipping."
+        end
+
         #        if @appliance_config.os.name.eql?("fedora") and @appliance_config.os.version.to_s.eql?("12")
         #          @log.debug "Downgrading udev package to use in EC2 environment..."
         #
@@ -190,7 +205,7 @@ module BoxGrinder
       offsets.each do |offset|
         loop_device = get_loop_device
         @exec_helper.execute("sudo losetup -o #{offset.to_s} #{loop_device} #{disk}")
-        label = @exec_helper.execute("e2label #{loop_device}").strip.chomp
+        label = @exec_helper.execute("sudo e2label #{loop_device}").strip.chomp
         label = '/' if label == ''
         mounts[label] = loop_device
       end

data/lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb

@@ -56,9 +56,9 @@ module BoxGrinder
 
       @log.debug "VMware image copied."
 
-      if @appliance_config.post.vmware.size > 0
+      unless @appliance_config.post['vmware'].nil?
         customize( @deliverables[:disk] ) do |guestfs, guestfs_helper|
-          @appliance_config.post.vmware.each do |cmd|
+          @appliance_config.post['vmware'].each do |cmd|
             @log.debug "Executing #{cmd}"
             guestfs.sh( cmd )
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +02:00
+date: 2010-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 10
-        version: 0.0.10
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency