fpm-dockery 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92438edd069b2d126631aec462f4413da8337994
-  data.tar.gz: dd4be38c6c33a50016269809012009d62cd86a14
+  metadata.gz: 081cca7e7810446df757cb19700fa3929b7c4818
+  data.tar.gz: b57c6427314d611d5533ec3016ae970da96e7ac3
 SHA512:
-  metadata.gz: 0aea7e497436295b38f0a9329f1853bf660f38d670a58865ab3ed8a9bd3dddbbf0c5848c7cd6042822bfd93996b75f939459b6e56a17b7368e291be7b1fa8002
-  data.tar.gz: 7234042aa6cf54a37db27e436d8f13605b6a7f45289717063c400cb57e5fbfdb72285b3785ae440f776a02b4ddcb7e2f317b5a957f56105be821ca6d3efa97fd
+  metadata.gz: bdfb857ea93ef4d44eacec4837d3758f645dde5f8d53ed9337c15dc496b8884f257e049aa3d68d9ff6cf6dd0a874a7b74373cf8092e166bcf114dccf536ecac2
+  data.tar.gz: e13c4be91ac5b68fbebd1d974f03718e941115c945bb1a78f2b6d55f0bb56c0e3da16ea7ef8bb046874f1f453e71c893a82961b611b72cebe06dd1cc6488c474

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.5
+
+* Update Rubygems when building the builder images. [@lloydpick](https://github.com/lloydpick)
+* Allow specifying a private SSH key (with `--private-key`) when packaging, in order to support
+  recipes that require cloning a private repository.
+
 ## 0.1.4
 
 * Unbreak building on platforms that aren't 'ubuntu'.

data/README.md

@@ -47,6 +47,8 @@ ensure packages are placed in the correct location.
 
 The following limitations are imposed on recipes you use with `fpm-dockery`:
 
+  * Docker 1.5 or later is required, as we make use of the `-f` flag with
+    `docker build`.
   * If a recipe includes external files, these files must be in the same directory
     as the recipe file, or any number of subdirectories below where the recipe file is located.
     This is because the directory containing the recipe is mounted inside the Docker container
@@ -101,6 +103,16 @@ argument `PACKAGE_DIR`:
 
     fpm-dockery package example_recipe/recipe.rb ubuntu12.04 /tmp/somedir
 
+If you're building a package from git source, and you're using a private repository 
+(on GitHub or BitBucket or wherever), you can supply an SSH private key to build with.
+The private key __must have no passphrase__. For reasons of security, it would be wise
+to create a keypair just for your package builds, and give it only read access to the repository.
+
+    fpm-dockery package --private-key some/path/builder-private-key example_recipe/recipe.rb ubuntu12.04
+
+If you'd like to make fpm-cookery skip the packaging step, supply the `--skip-package` option:
+
+    fpm-dockery package --skip-package example_recipe/recipe.rb ubuntu12.04
 
 ### Viewing available builders
 

data/docker/Dockerfile.ubuntu12.04

@@ -18,8 +18,15 @@ RUN apt-get update
 RUN apt-get -y install ruby2.1
 RUN apt-get -y install ruby2.1-dev
 
+# Update rubygems and don't install docs
+RUN gem update --system --verbose
+RUN echo "gem: --no-document" >> ~/.gemrc
+
 # Install fpm-cookery
 RUN gem install fpm-cookery -v 0.27.0
 
+# Remove strict host key checking for SSH
+RUN echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config
+
 # Set an entry point to simplify command execution
-ENTRYPOINT ["/usr/local/bin/fpm-cook"]
+ENTRYPOINT ["/usr/local/bin/fpm-cook"]

data/docker/Dockerfile.ubuntu14.04

@@ -18,8 +18,15 @@ RUN apt-get update
 RUN apt-get -y install ruby2.1
 RUN apt-get -y install ruby2.1-dev
 
+# Update rubygems and don't install docs
+RUN gem update --system --verbose
+RUN echo "gem: --no-document" >> ~/.gemrc
+
 # Install fpm-cookery
 RUN gem install fpm-cookery -v 0.27.0
 
+# Remove strict host key checking for SSH
+RUN echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config
+
 # Set an entry point to simplify command execution
-ENTRYPOINT ["/usr/local/bin/fpm-cook"]
+ENTRYPOINT ["/usr/local/bin/fpm-cook"]

data/lib/fpm/dockery/cli.rb

@@ -67,6 +67,7 @@ module FPM
         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)"
+        option "--private-key", "PRIVATE_KEY", "Private key to use with SSH (for example, when cloning private Git repositories)"
         
         def execute
           recipe_path = File.expand_path(recipe)
@@ -86,6 +87,10 @@ module FPM
             pkg_dir = "/output"
           end
           
+          if private_key
+            extra_docker_commands << "-v #{File.expand_path(private_key)}:/root/.ssh/id_rsa"
+          end
+          
           if skip_package?
             extra_fpm_cook_commands << "--skip-package"
           end

data/lib/fpm/dockery/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-dockery
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andy Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp