fpm-dockery 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad30556cb4aef21a9c240d15ef05370347bc9ab8
-  data.tar.gz: 2ec29e04ad95788dc287b69dfa5cbe9e48ce52d3
+  metadata.gz: 07381f13b35eb3f6a98665256001b2821d3c00cf
+  data.tar.gz: 003bb31babdf01f1745dfd52fa83d863eb6d3fc7
 SHA512:
-  metadata.gz: d26d74b4b10abd8dd3b4f0d75608f76acb80413a07586a8551fbb21e8ecbd487e2985380d739b3aa112c72376f867dc4438d52aa32fa9d6f86a14575343fc11d
-  data.tar.gz: efd7e64c768bfd4d5cd461ba38951f1ff9f1f649fade53d13f736591a5894ebfa634d9308d16cc3268a65a1f4591625afda3f457403d2e4d1dbba0284074bb1f
+  metadata.gz: 60727d2485328174fa0d136978d59194a1578e64cda1142080e243e966e19cf616405106adb6916eedca45575584023ce0d28cdfd72d441db4f7f31c7d91c675
+  data.tar.gz: ca169f343ca419af204f8da74f54386882f4edefa0e300336d00206067896a11b26c23de42560ee0dd2ce61e9e310dc436c393d369e034a260f2820547882d33

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.8
+
+* Added support for supplying extra Docker parameters to the build with `--docker-params`. [@randomvariable](https://github.com/randomvariable)
+* Added support for Centos 6, Centos 7, Ubuntu 15.04. [@randomvariable](https://github.com/randomvariable)
+
 ## 0.1.7
 
 * Add the ability to have a local cache dir. [@lloydpick](https://github.com/lloydpick)

data/README.md

@@ -4,9 +4,9 @@ Build [fpm-cookery](https://github.com/forward3d/fpm-cookery) recipes with Docke
 
 ## What is this?
 
-This is a terribly-named wrapper around [fpm-cookery](https://github.com/forward3d/fpm-cookery) 
-that allows you to run fpm-cookery builds inside a container. I wrote this to allow me to run package builds 
-in development on my laptop in the same way that Jenkins runs them, and to allow easy building of packages 
+This is a terribly-named wrapper around [fpm-cookery](https://github.com/forward3d/fpm-cookery)
+that allows you to run fpm-cookery builds inside a container. I wrote this to allow me to run package builds
+in development on my laptop in the same way that Jenkins runs them, and to allow easy building of packages
 for a variety of Linux distributions.
 
 ## Why would you use this?
@@ -15,9 +15,9 @@ If you are building your own operating system packages, you should be running th
 environment every time. fpm-cookery is a superb tool for expressing the process of building and packaging
 using fpm, but it provides no real functionality for working in a clean environment.
 
-With the advent of [Docker](https://www.docker.com/), it is fast and easy to bring up an isolated 
-environment (a container) to perform the package building in. It also allows your CI server to perform 
-a very simple invocation to build packages (`fpm-dockery build recipe.rb ubuntu12.04`), and allows you 
+With the advent of [Docker](https://www.docker.com/), it is fast and easy to bring up an isolated
+environment (a container) to perform the package building in. It also allows your CI server to perform
+a very simple invocation to build packages (`fpm-dockery build recipe.rb ubuntu12.04`), and allows you
 to run the same build on your development machine in the same way.
 
 If a build fails, you can easily re-run the container and be dropped into the state where the build failed.
@@ -25,10 +25,10 @@ This makes it very easy to troubleshoot why a build is failing.
 
 ## How does it work?
 
-`fpm-dockery` has the notion of 'builder' images. These are specially prepared Docker images that 
+`fpm-dockery` has the notion of 'builder' images. These are specially prepared Docker images that
 contain enough tooling to get `fpm-cookery` working, along with `fpm-cookery` itself.
 
-You can see the Dockerfiles used to generate these images in the 
+You can see the Dockerfiles used to generate these images in the
 [`docker` directory](https://github.com/andytinycat/fpm-dockery/tree/master/docker) of this
 repository.
 
@@ -70,16 +70,16 @@ Once you've installed it, you will have access to the `fpm-dockery` command line
     $ bin/fpm-dockery --help
     Usage:
         fpm-dockery [OPTIONS] SUBCOMMAND [ARG] ...
-    
+
     Parameters:
         SUBCOMMAND                    subcommand
         [ARG] ...                     subcommand arguments
-    
+
     Subcommands:
         create-builder-image          Build one of the fpm-dockery Docker 'builder' images
         package                       Run fpm-cookery in a Docker container to produce a package
         list-builders                 List available builders
-    
+
     Options:
         -h, --help                    print help
 
@@ -90,7 +90,7 @@ optional argument:
 
     fpm-dockery package PATH_TO_RECIPE BUILDER [PACKAGE_DIR]
 
-The builder is one of the supported builder images. If the builder image does not exist on the 
+The builder is one of the supported builder images. If the builder image does not exist on the
 system where Docker is running, it will be automatically created first. The packages will be
 created in `PATH_TO_RECIPE/pkg`.
 
@@ -103,7 +103,7 @@ 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 
+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.
@@ -118,6 +118,12 @@ If you'd like to make fpm-cookery skip the packaging step, supply the `--skip-pa
 
     fpm-dockery package --skip-package example_recipe/recipe.rb ubuntu12.04
 
+If you'd like to supply more docker run parameters, for example environment variables, supply the `--docker-params` option:
+
+    fpm-dockery package --docker-params "-e PKG_VER=2.0" example_recipe/recipe.rb ubuntu12.04
+
+
+
 ### Viewing available builders
 
 To see the available builders, run:
@@ -156,8 +162,8 @@ some unpleasant homegrown scripts at [Forward3D](https://github.com/forward3d),
 
 ## Acknowledgements
 
-Thanks to [@bernd](https://github.com/bernd) for creating fpm-cookery, and [@sissel](https://github.com/jordansissel) 
+Thanks to [@bernd](https://github.com/bernd) for creating fpm-cookery, and [@sissel](https://github.com/jordansissel)
 for creating FPM, without which life would be less pleasant.
 
-I also used the Redis example recipe from @bernd's repository and placed it in this repository so it can be used 
+I also used the Redis example recipe from @bernd's repository and placed it in this repository so it can be used
 for a quick proof-of-concept.

data/docker/Dockerfile.centos6

@@ -0,0 +1,45 @@
+FROM centos:6
+
+RUN yum -y update
+
+# Additional tooling
+RUN yum install -y git
+RUN yum install -y curl
+RUN yum install -y mercurial
+RUN yum install -y subversion
+RUN yum install -y unzip
+RUN yum install -y tar
+
+# Build tools
+RUN yum install -y gcc
+RUN yum install -y gcc-c++
+RUN yum install -y glibc-devel
+RUN yum install -y make
+RUN yum install -y rpm-build
+
+# Ruby dependencies
+RUN yum install -y openssl-devel
+RUN yum install -y readline-devel
+RUN yum install -y zlib-devel
+
+# Install Ruby via rbenv
+RUN git clone https://github.com/sstephenson/rbenv.git  ~/.rbenv
+RUN echo 'export PATH="/root/.rbenv/bin:$PATH"' >> /etc/profile.d/rbenv
+ENV PATH /root/.rbenv/bin:$PATH
+RUN git clone https://github.com/sstephenson/ruby-build.git  ~/.rbenv/plugins/ruby-build
+RUN source /etc/profile
+RUN rbenv install 2.1.5
+ENV PATH /root/.rbenv/versions/2.1.5/bin:$PATH
+
+# 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 ["/root/.rbenv/versions/2.1.5/bin/fpm-cook"]

data/docker/Dockerfile.centos7

@@ -0,0 +1,45 @@
+FROM centos:7
+
+RUN yum -y update
+
+# Additional tooling
+RUN yum install -y git
+RUN yum install -y curl
+RUN yum install -y mercurial
+RUN yum install -y subversion
+RUN yum install -y unzip
+RUN yum install -y tar
+
+# Build tools
+RUN yum install -y gcc
+RUN yum install -y gcc-c++
+RUN yum install -y glibc-devel
+RUN yum install -y make
+RUN yum install -y rpm-build
+
+# Ruby dependencies
+RUN yum install -y openssl-devel
+RUN yum install -y readline-devel
+RUN yum install -y zlib-devel
+
+# Install Ruby via rbenv
+RUN git clone https://github.com/sstephenson/rbenv.git  ~/.rbenv
+RUN echo 'export PATH="/root/.rbenv/bin:$PATH"' >> /etc/profile.d/rbenv
+ENV PATH /root/.rbenv/bin:$PATH
+RUN git clone https://github.com/sstephenson/ruby-build.git  ~/.rbenv/plugins/ruby-build
+RUN source /etc/profile
+RUN rbenv install 2.1.5
+ENV PATH /root/.rbenv/versions/2.1.5/bin:$PATH
+
+# 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 ["/root/.rbenv/versions/2.1.5/bin/fpm-cook"]

data/docker/Dockerfile.ubuntu15.04

@@ -0,0 +1,33 @@
+FROM ubuntu:15.04
+
+RUN apt-get update
+
+# Additional tooling
+RUN apt-get install -y git
+RUN apt-get install -y curl
+RUN apt-get install -y mercurial
+RUN apt-get install -y subversion
+RUN apt-get install -y unzip
+
+# Build tools
+RUN apt-get install -y build-essential
+
+# Install Ruby from Brightbox's PPA
+RUN apt-get -y install software-properties-common
+RUN apt-add-repository ppa:brightbox/ruby-ng
+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"]

data/lib/fpm/dockery/cli.rb

@@ -3,17 +3,17 @@ require 'optparse'
 module FPM
   module Dockery
     class CLI < Clamp::Command
-      
+
       class BaseCommand < Clamp::Command
         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)
@@ -21,7 +21,7 @@ module FPM
             exit 1
           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}")
@@ -30,7 +30,7 @@ module FPM
             create_builder(false)
           end
         end
-        
+
         # Create a builder image.
         def create_builder(no_cache)
           validate_builder!
@@ -43,24 +43,24 @@ module FPM
             exit exit_status.exitstatus
           end
         end
-        
+
       end
-      
+
       class ListBuildersCommand < BaseCommand
         def execute
           puts valid_builders.join("\n")
         end
       end
-      
+
       class CreateBuilderImage < BaseCommand
         parameter "BUILDER", "Type of builder image to build"
         option "--no-cache", :flag, "Build without cache"
-      
+
         def execute
           create_builder(no_cache?)
         end
       end
-      
+
       # The package command implementation.
       class PackageCommand < BaseCommand
         parameter "RECIPE", "fpm-cookery recipe to build"
@@ -69,25 +69,28 @@ module FPM
         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)"
         option "--local-cache-dir", "DIR", "Local cache directory to use (useful if you are working with large source files)"
+        option "--docker-params", "DOCKER_PARAMS", "Extra Docker run parameters"
 
         def execute
           recipe_path = File.expand_path(recipe)
           dir_to_mount = File.dirname(recipe_path)
           name_of_recipe = File.basename(recipe_path)
-          
+
           validate_builder!
           create_builder_if_required
-          
+
           extra_docker_commands = []
           extra_fpm_cook_commands = []
-          
+
           pkg_dir = "/recipe/pkg"
-          
+
           if package_dir
             extra_docker_commands << "-v #{File.expand_path(package_dir)}:/output"
             pkg_dir = "/output"
           end
-          
+
+          extra_docker_commands << docker_params if docker_params
+
           if private_key
             begin
               key = IO.read(File.expand_path(private_key))
@@ -109,7 +112,7 @@ module FPM
           if skip_package?
             extra_fpm_cook_commands << "--skip-package"
           end
-            
+
           command = <<eos
 docker run \
 -v #{dir_to_mount}:/recipe \
@@ -130,13 +133,13 @@ eos
             exit exit_status.exitstatus
           end
         end
-        
+
       end
-      
-      subcommand "create-builder-image", "Build one of the fpm-dockery Docker 'builder' images", CreateBuilderImage      
+
+      subcommand "create-builder-image", "Build one of the fpm-dockery Docker 'builder' images", CreateBuilderImage
       subcommand "package", "Run fpm-cookery in a Docker container to produce a package", PackageCommand
       subcommand "list-builders", "List available builders", ListBuildersCommand
-      
+
     end
   end
-end
+end

data/lib/fpm/dockery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Dockery
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-dockery
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andy Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -70,8 +70,11 @@ files:
 - README.md
 - Rakefile
 - bin/fpm-dockery
+- docker/Dockerfile.centos6
+- docker/Dockerfile.centos7
 - docker/Dockerfile.ubuntu12.04
 - docker/Dockerfile.ubuntu14.04
+- docker/Dockerfile.ubuntu15.04
 - example_recipe/recipe.rb
 - example_recipe/redis-server.init.d
 - fpm-dockery.gemspec