fpm-dockery 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c935a1fef8fa2087d31346840b6485bc572ec539
-  data.tar.gz: 9d200efd489fd6d69d29ecdf16d15eed9ed9e929
+  metadata.gz: 7f32f78d6ae454c52ef25fe144f36976b98d342f
+  data.tar.gz: 5eb288fd9f7db6d2c05ccf025e46f7f47d33b403
 SHA512:
-  metadata.gz: 9ba023b1e3175338547cb678b8b7601d6d2fccb59c50fa942d7d01de325ca78a7d07b8d53aee03ac445edf3ee3cc1b427870a8300152d8c9a556eecab5518081
-  data.tar.gz: f6084650e84dc08246ada4911a3b1f22c2ac86e2ab869ae74474a75137212f5e5d244ddd3b3c400b302209548ce18e2b83f819a590bbfa5b9404e8940862944b
+  metadata.gz: 9f730d49772a2e937dd6d2603da20706684e54ae7f3b36f749f057408f0ec9e34f2be2d8b50cb7519c2e9fec00ed78108affe4741ddd26ffdd79f37769959320
+  data.tar.gz: 7beceb3533101cf991e1a7e57d236d2edcdb3f3f95465423d1722cb9a232dec59fe7bbb62bae0b6c3eec21aaca15a758b9e0cc7c836727f27a404f52cdd73747

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.1.1
+
+* Add support for fpm-cook's --skip-package option.
+
+## 0.1.0
+
+* Initial version.

data/lib/fpm/dockery/cli.rb

@@ -8,10 +8,13 @@ module FPM
         include Logging
         include Utils
         
+        # List all valid builders by listing the Dockerfile.* files in
+        # the docker directory.
         def valid_builders
           Dir.glob("#{FPM::Dockery.root}/docker/Dockerfile.*").map {|f| File.basename(f.gsub('Dockerfile.', ''))}
         end
         
+        # Check the builder is one we have a Dockerfile for.
         def validate_builder!
           unless valid_builders.include?(builder)
             fatal "Image type must be one of: #{valid_builders.join(', ')}"
@@ -19,6 +22,7 @@ module FPM
           end
         end
         
+        # Create a builder image if it doesn't exist.
         def create_builder_if_required
           image_check = Subprocess.run("docker images | awk '{print $1}' | grep fpm-dockery/#{builder}")
           unless image_check.exitstatus == 0
@@ -27,6 +31,7 @@ module FPM
           end
         end
         
+        # Create a builder image.
         def create_builder(no_cache)
           validate_builder!
           cache_option = no_cache ? '--no-cache=true' : ''
@@ -55,11 +60,13 @@ module FPM
           create_builder(no_cache?)
         end
       end
-    
+      
+      # The package command implementation.
       class PackageCommand < BaseCommand
         parameter "RECIPE", "fpm-cookery recipe to build"
         parameter "BUILDER", "Builder to use"
         parameter "[PACKAGE_DIR]", "Where to place the packages created by the build (defaults to /pkg in same dir as recipe)"
+        option "--skip-package", :flag, "Skip package building (identical to fpm-cook --skip-package)"
         
         def execute
           recipe_path = File.expand_path(recipe)
@@ -69,23 +76,30 @@ module FPM
           validate_builder!
           create_builder_if_required
           
-          extra_command = ''
+          extra_docker_commands = []
+          extra_fpm_cook_commands = []
+          
           pkg_dir = "/recipe/pkg"
           
           if package_dir
-            extra_command = "-v #{File.expand_path(package_dir)}:/output"
+            extra_docker_commands << "-v #{File.expand_path(package_dir)}:/output"
             pkg_dir = "/output"
           end
+          
+          if skip_package?
+            extra_fpm_cook_commands << "--skip-package"
+          end
             
           command = <<eos
 docker run \
 -v #{dir_to_mount}:/recipe \
-#{extra_command} \
+#{extra_docker_commands.join(' ')} \
 fpm-dockery/ubuntu \
 --tmp-root /tmp/tmproot \
 --pkg-dir #{pkg_dir} \
 --cache-dir /tmp/cache \
 package \
+#{extra_fpm_cook_commands.join(' ')} \
 /recipe/#{name_of_recipe}
 eos
           exit_status = Subprocess.run(command)

data/lib/fpm/dockery/version.rb

@@ -1,5 +1,5 @@
 module Fpm
   module Dockery
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-dockery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andy Sykes
@@ -63,6 +63,7 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md