fpm-dockery 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081cca7e7810446df757cb19700fa3929b7c4818
-  data.tar.gz: b57c6427314d611d5533ec3016ae970da96e7ac3
+  metadata.gz: a232c25c8dfac4c320371918387d390d9a96dc49
+  data.tar.gz: 16d9594abe5ffce3372d58412242a718d0e95f57
 SHA512:
-  metadata.gz: bdfb857ea93ef4d44eacec4837d3758f645dde5f8d53ed9337c15dc496b8884f257e049aa3d68d9ff6cf6dd0a874a7b74373cf8092e166bcf114dccf536ecac2
-  data.tar.gz: e13c4be91ac5b68fbebd1d974f03718e941115c945bb1a78f2b6d55f0bb56c0e3da16ea7ef8bb046874f1f453e71c893a82961b611b72cebe06dd1cc6488c474
+  metadata.gz: e3cd7add0d0d5598f21adb1c4af2a17b17f70ab3a6fb5dcec6d7256f120c4ab3ffce92ac549ecdf30083d51d4838cd5bcaf1bd2677f5e2d913ef966aafa85312
+  data.tar.gz: 3660c5d4f2534b164daec5119d56d0f5904c0730225483a9bcf2a05c58c7fb74802efd6b20c7bc3493a5002dbbce437c4bda58b33898fb56046719adb76964b8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.6
+
+* Check private key exists and does not have a passphrase. [@lloydpick](https://github.com/lloydpick)
+
 ## 0.1.5
 
 * Update Rubygems when building the builder images. [@lloydpick](https://github.com/lloydpick)

data/lib/fpm/dockery/cli.rb

@@ -88,7 +88,17 @@ module FPM
           end
           
           if private_key
-            extra_docker_commands << "-v #{File.expand_path(private_key)}:/root/.ssh/id_rsa"
+            begin
+              key = IO.read(File.expand_path(private_key))
+              if key.include?('ENCRYPTED')
+                fatal 'Provided private key has a passphrase ' + private_key
+                exit 1
+              end
+              extra_docker_commands << "-v #{File.expand_path(private_key)}:/root/.ssh/id_rsa"
+            rescue Errno::ENOENT
+              fatal 'Provided private key does not exist ' + private_key
+              exit 1
+            end
           end
           
           if skip_package?

data/lib/fpm/dockery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Dockery
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-dockery
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andy Sykes