minke 1.14.5 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a7b8b60ccbed410eeb27018feca48de863eb62
-  data.tar.gz: f7eff0ed28dbddfdd61b8f5ad4e8930c6820bb17
+  metadata.gz: e2de397efc3384343df824b01a7700343a6bfe0a
+  data.tar.gz: c0cceaca1847f3749b488c53e91b3ca50e99c49d
 SHA512:
-  metadata.gz: 4320dc51fffbf2605acd2a775e706d6b818f767e9adac3263f759eac4b23b0f23e7a02a3a6f10b3ef715db728c9854c8fe1fb763ab1e58e681a58c038f7ba156
-  data.tar.gz: 36e008f6e038ef2f70728d57d436d7f7d660928c63f07754d16a1e385ce6b5c52e38dd9353839a39fe6b0dd21647a34f341da992539d3f1c6487b13b6322a255
+  metadata.gz: 8fca8727f5be9e3d9fdc0bcb475b4420bf6a82af9d9c57f872ca13778790d35866934d8152ced0964a479f229cb9c7bf9867a6365f0c14bff49679852b9738fa
+  data.tar.gz: 6dfa67110af32328eeadf1c111b146f957f28f83e73d649dfc506675c84607f1184dde9493167fc8da38b778a50a456afd2d242d9d621d3ce96015d7124a6749

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     docker build -t nicholasjackson/minke --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` .;
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     docker push nicholasjackson/minke:latest;
-    docker tag nicholasjackson/minke nicholasjackson/minke:1.14.5;
-    docker push nicholasjackson/minke:1.14.5;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.15.0;
+    docker push nicholasjackson/minke:1.15.0;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/README.md

@@ -24,23 +24,23 @@ $ mkdir ~/myservice
 $ cd ~/myservice
 ```
 
-2. Run the generator command in a docker container. (note the space before -g)
+2. Run the generator command in a docker container.
 
 ```bash
-$ curl -L -s get.minke.rocks | bash -s ' -g minke-generator-go -o $(pwd) -n github.com/nicholasjackson -a myservice'
+$ curl -Ls https://get.minke.rocks | bash -s 'generate -g minke-generator-go -o $(pwd) -n github.com/nicholasjackson -a myservice'
 ```
 
 3. Build a Docker image
 
 ```bash
-$ cd _build
-$ ./minke.sh rake app:build_image
+$ cd _minke
+$ ./minke -v build_image
 ```
 
 4. Execute the functional tests
 
 ```bash
-$ ./minke.sh rake app:cucumber
+$ ./minke -v cucumber
 ```
 
 You now have a working microservice ready to be pushed to a Docker registry and deployed to a server.  For more detailed information please see the [tutorial](tutorial.html).

data/bin/minke

@@ -40,12 +40,14 @@ Commonly used command are:
    push        :     push built image to the registry
    encrypt     :     encrypt secrets with a private key
    shell       :     start a shell session inside the build container
+   provision   :     run the provisioner using terraform
 See 'minke COMMAND --help' for more information on a specific command.
 HELP
 
 global = OptionParser.new do |opts|
   opts.banner = "Usage: minke [options] [subcommand [options]]"
   opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = true }
+  opts.on("-m", "-m [FOLDER]", "Mount folder in Minke container, e.g. ssh keys") { }
   opts.on("-A", "--forward-ssh", "Forward ssh keys to docker") { |v| options[:forward_ssh] = true }
   opts.separator ""
   opts.separator subtext
@@ -76,8 +78,16 @@ subcommands = {
 
       opts.on('-e', '--encrypt STRING', 'Encrypt a string') { |v| options[:encrypt] = v }
       opts.on('-k', '--key STRING', 'Private key to use for encryption') { |v| options[:key] = v }
+   end,
+   
+   'provision' => OptionParser.new do |opts|
+      opts.banner = "Usage: minke [options] provision [options]"
+
+      opts.on('-plan',    '', 'Run terraform plan')      { |v| options[:provision_mode] = 'plan'    }
+      opts.on('-apply',   '', 'Run terraform apply')     { |v| options[:provision_mode] = 'apply'   }
+      opts.on('-destroy', '', 'Run terraform destroy')   { |v| options[:provision_mode] = 'destroy' }
     end
- }
+}
 
 global.order!
 command = ARGV.shift
@@ -99,12 +109,13 @@ def load_config config_file, verbose
   return config, generator_config
 end
 
-def doCommand(command, verbose, config_file = nil)
+def doCommand(command, verbose, options, config_file = nil)
   config, generator_config = load_config(config_file, verbose) unless config_file == nil
   Minke::Command.new(
     config, 
     generator_config,
-    verbose
+    verbose,
+    options
   ).public_send(command)
 end
 
@@ -143,21 +154,23 @@ end
 
 case command
 when "test"
-  doCommand(:test, options[:verbose], options[:config])
+  doCommand(:test, options[:verbose], options, options[:config])
 when "build"
-  doCommand(:build, options[:verbose], options[:config])
+  doCommand(:build, options[:verbose], options, options[:config])
 when "fetch"
-  doCommand(:fetch, options[:verbose], options[:config])
+  doCommand(:fetch, options[:verbose], options, options[:config])
 when "cucumber"
-  doCommand(:cucumber, options[:verbose], options[:config])
+  doCommand(:cucumber, options[:verbose], options, options[:config])
 when "build_image"
-  doCommand(:build_image, options[:verbose], options[:config])
+  doCommand(:build_image, options[:verbose], options, options[:config])
 when "run"
-  doCommand(:run, options[:verbose], options[:config])
+  doCommand(:run, options[:verbose], options, options[:config])
 when "push"
-  doCommand(:push, options[:verbose], options[:config])
+  doCommand(:push, options[:verbose], options, options[:config])
 when "shell"
-  doCommand(:shell, options[:verbose], options[:config])
+  doCommand(:shell, options[:verbose], options, options[:config])
+when "provision"
+  doCommand(:provision, options[:verbose], options, options[:config])
 when "generate"
   if options[:generator] == nil || options[:output] == nil || options[:name] == nil || options[:namespace] == nil
     puts "Please specify options use: minke generate --help for help on command line options"

data/docker/Dockerfile

@@ -1,6 +1,7 @@
 FROM ruby:2.3.1
 
 ENV COMPOSE_VERSION 1.11.1
+ENV TERRAFORM_VERSION 0.9.2
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
   # Build-time metadata as defined at http://label-schema.org
@@ -16,7 +17,7 @@ ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
         org.label-schema.vcs-url="https://github.com/nicholasjackson/minke"
 
 RUN apt-get update
-RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https
+RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https unzip
 
 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
 
@@ -29,6 +30,11 @@ RUN curl -o /usr/local/bin/docker-compose -L \
 		"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
 	&& chmod +x /usr/local/bin/docker-compose
 
+RUN curl -o ./terraform.zip \
+      "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" \
+      && unzip ./terraform.zip \
+      && mv ./terraform /usr/local/bin/terraform
+
 COPY Gemfile Gemfile
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh

data/docker/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.14.5"
+gem 'minke', "= 1.15.0"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.9.3"

data/lib/minke.rb

@@ -34,6 +34,15 @@ require 'minke/docker/consul'
 require 'minke/docker/network'
 
 require 'minke/config/config'
+require 'minke/config/consul_loader'
+require 'minke/config/copy'
+require 'minke/config/docker_registry_settings'
+require 'minke/config/docker_settings'
+require 'minke/config/task'
+require 'minke/config/task_run_settings'
+require 'minke/config/url'
+require 'minke/config/terraform'
+require 'minke/config/environment_settings'
 require 'minke/config/reader'
 
 require 'minke/tasks/task_runner'
@@ -47,6 +56,7 @@ require 'minke/tasks/run'
 require 'minke/tasks/test'
 require 'minke/tasks/build_image'
 require 'minke/tasks/shell'
+require 'minke/tasks/terraform'
 
 require 'minke/generators/config'
 require 'minke/generators/config_processor'

data/lib/minke/command.rb

@@ -1,11 +1,12 @@
 module Minke
   class Command
-    attr_accessor :config, :generator_config, :verbose
+    attr_accessor :config, :generator_config, :verbose, :args
 
-    def initialize(config, generator_config, verbose)
+    def initialize(config, generator_config, verbose, args)
       self.config = config
       self.generator_config = generator_config
       self.verbose = verbose
+      self.args = args
     end
 
     # Creates dependencies for minke
@@ -69,7 +70,8 @@ module Minke
         :build_image => Minke::Tasks::BuildImage.new(dependencies),
         :cucumber    => Minke::Tasks::Cucumber.new(dependencies),
         :push        => Minke::Tasks::Push.new(dependencies),
-        :shell       => Minke::Tasks::Shell.new(dependencies)
+        :shell       => Minke::Tasks::Shell.new(dependencies),
+        :provision   => Minke::Tasks::Terraform.new(dependencies)
       }
     end
 
@@ -129,5 +131,12 @@ module Minke
         tasks[:shell].run
       end
     end
+    
+    def provision
+      if config.provision != nil
+        tasks = create_tasks :provision
+        tasks[:provision].run self.args[:provision_mode]
+      end
+    end
   end
 end

data/lib/minke/config/config.rb

@@ -76,6 +76,13 @@ module Minke
       #
       # [Optional] if not provided the shell commands will not be executed
       attr_accessor :shell
+      
+      ##
+      # Settings for the build provision phase
+      # instance of Minke::Config::Task
+      #
+      # [Optional] if not provided the provision commands will not be executed
+      attr_accessor :provision
 
       ##
       # Returns the docker_compose file for the given section,
@@ -141,200 +148,5 @@ module Minke
       end
     end
 
-    ##
-    # DockerRegistrySettings encapsulates the settings related to the docker registry
-    class DockerRegistrySettings
-      ##
-      # url of the docker registry to use.
-      #
-      # [Optional]
-      attr_accessor :url
-
-      ##
-      # user to use when logging into a docker registry.
-      #
-      # [Optional]
-      attr_accessor :user
-
-      ##
-      # password to use when logging into a docker registry.
-      #
-      # [Optional]
-      attr_accessor :password
-
-      ##
-      # email to use when logging into a docker registry.
-      #
-      # [Optional]
-      attr_accessor :email
-
-      ##
-      # namespace to use when tagging an image for the docker registry.
-      #
-      # [Required]
-      attr_accessor :namespace
-    end
-
-    ##
-    # DockerSettings encapsulate the configuration used when running builds using docker.
-    class DockerSettings
-      ##
-      # Docker Image to use when building the application source code.
-      #
-      # [Optional]
-      attr_accessor :build_image
-
-      ##
-      # Specific docker settings to allow an override of the defaults provided by the template, you may want to use
-      # this if you require a specific piece of software to be installed on the build container.
-      #
-      # [Optional]
-      attr_accessor :build_docker_file
-
-      ##
-      # Dockerfile to use when creating the final docker image.
-      #
-      # [Required]
-      attr_accessor :application_docker_file
-
-      ##
-      # Docker compose file to use when running and executing cucumber tests.
-      #
-      # [Required]
-      attr_accessor :application_compose_file
-
-      ##
-      # Working directory to use for build root, relative to project root
-      #
-      # [Optional]
-      attr_accessor :working_directory
-    end
-
-    ##
-    # Task encapsulates the configuration for the various rake tasks like build, run, etc.
-    class Task
-      ##
-      # consul_loader will specify that the given config file is loaded into Consul.
-      # instance of Minke::Config::ConsulLoader
-      #
-      # [Optional]
-      attr_accessor :consul_loader
-
-      ##
-      # health_check is the string representation of a url to check before continuing with the rest of the
-      # task a successfull 200 response from the endpoint is required to contine.
-      #
-      # [Optional]
-      attr_accessor :health_check
-
-      ##
-      # pre tasks will run before the main task executes.
-      # instance of Minke::Config::TaskRunSettings
-      #
-      # [Optional]
-      attr_accessor :pre
-
-      ##
-      # post tasks will run after the main task executes.
-      # instance of Minke::Config::TaskRunSettings
-      #
-      # [Optional]
-      attr_accessor :post
-
-      ##
-      # docker config allows you to override the main docker configuration on a per task basis.
-      # instance of Minke::Config::TaskRunSettings
-      #
-      # [Optional]
-      attr_accessor :docker
-
-      ##
-      # ports contains an array of Minke::Config::ContainerAddress which holds the details
-      # for the address the public and private ports of any containers which will be started by this
-      # task.
-      attr_accessor :ports
-    end
-
-    ##
-    # TaskRunSettings encapsulates the configuration for the various pre and post sections for each task.
-    # You can use this section to load config into consul, wait for a health check to complete, copy files
-    # or execute other tasks defined in your Rakefile.
-    class TaskRunSettings
-      ##
-      # tasks is an array of strings which point to a defined task in your Rakefile.
-      #
-      # [Optional]
-      attr_accessor :tasks
-
-      ##
-      # copy is an array of Copy instances which will be copied before the task continues.
-      # instance of Minke::Config::Copy
-      #
-      # [Optional]
-      attr_accessor :copy
-    end
-
-    ##
-    # ConsulLoader defines the settings and url to be loaded into a running consul instance.
-    class ConsulLoader
-      ##
-      # config_file points to a yaml file of key values to load into consul.
-      #
-      # [Required]
-      attr_accessor :config_file
-
-      ##
-      # url is the url to the running consul instance into which the keys and values will be loaded.
-      #
-      # [Required]
-      attr_accessor :url
-    end
-
-    ##
-    # Copy defines a source and destination of either a file or directory to be copied during a task.
-    class Copy
-      ##
-      # from is the file or directory to copy from.
-      #
-      # [Required]
-      attr_accessor :from
-
-      ##
-      # to is the file or directory to copy to.
-      #
-      # [Required]
-      attr_accessor :to
-    end
-
-    ##
-    # URL represents a url object which is used for health_check and consul_loader locations
-    class URL
-      ##
-      # address of the server i.e 127.0.0.1 or the docker name consul
-      attr_accessor :address
-
-      ##
-      # port which the server is running on
-      # default 80
-      attr_accessor :port
-
-      ##
-      # protocol for the server
-      # - http [default]
-      # - https
-      attr_accessor :protocol
-
-      ##
-      # path for the server
-      # default /
-      attr_accessor :path
-
-      ##
-      # type of the URL
-      # - public
-      # - private used for linked containers
-      attr_accessor :type
-    end
-
   end
 end

data/lib/minke/config/consul_loader.rb

@@ -0,0 +1,19 @@
+module Minke
+  module Config
+    ##
+    # ConsulLoader defines the settings and url to be loaded into a running consul instance.
+    class ConsulLoader
+      ##
+      # config_file points to a yaml file of key values to load into consul.
+      #
+      # [Required]
+      attr_accessor :config_file
+
+      ##
+      # url is the url to the running consul instance into which the keys and values will be loaded.
+      #
+      # [Required]
+      attr_accessor :url
+    end
+  end
+end

data/lib/minke/config/copy.rb

@@ -0,0 +1,19 @@
+module Minke
+  module Config
+    ##
+    # Copy defines a source and destination of either a file or directory to be copied during a task.
+    class Copy
+      ##
+      # from is the file or directory to copy from.
+      #
+      # [Required]
+      attr_accessor :from
+
+      ##
+      # to is the file or directory to copy to.
+      #
+      # [Required]
+      attr_accessor :to
+    end
+  end
+end

data/lib/minke/config/docker_registry_settings.rb

@@ -0,0 +1,37 @@
+module Minke
+  module Config
+    ##
+    # DockerRegistrySettings encapsulates the settings related to the docker registry
+    class DockerRegistrySettings
+      ##
+      # url of the docker registry to use.
+      #
+      # [Optional]
+      attr_accessor :url
+
+      ##
+      # user to use when logging into a docker registry.
+      #
+      # [Optional]
+      attr_accessor :user
+
+      ##
+      # password to use when logging into a docker registry.
+      #
+      # [Optional]
+      attr_accessor :password
+
+      ##
+      # email to use when logging into a docker registry.
+      #
+      # [Optional]
+      attr_accessor :email
+
+      ##
+      # namespace to use when tagging an image for the docker registry.
+      #
+      # [Required]
+      attr_accessor :namespace
+    end
+  end
+end

data/lib/minke/config/docker_settings.rb

@@ -0,0 +1,38 @@
+module Minke
+  module Config
+    ##
+    # DockerSettings encapsulate the configuration used when running builds using docker.
+    class DockerSettings
+      ##
+      # Docker Image to use when building the application source code.
+      #
+      # [Optional]
+      attr_accessor :build_image
+
+      ##
+      # Specific docker settings to allow an override of the defaults provided by the template, you may want to use
+      # this if you require a specific piece of software to be installed on the build container.
+      #
+      # [Optional]
+      attr_accessor :build_docker_file
+
+      ##
+      # Dockerfile to use when creating the final docker image.
+      #
+      # [Required]
+      attr_accessor :application_docker_file
+
+      ##
+      # Docker compose file to use when running and executing cucumber tests.
+      #
+      # [Required]
+      attr_accessor :application_compose_file
+
+      ##
+      # Working directory to use for build root, relative to project root
+      #
+      # [Optional]
+      attr_accessor :working_directory
+    end
+  end
+end

data/lib/minke/config/environment_settings.rb

@@ -0,0 +1,10 @@
+module Minke
+  module Config
+    ##
+    # EnvironmentSettings is a hash containing the environment variables which
+    # will be set to the current shell when the minke task runs.
+    class EnvironmentSettings < Hash
+       
+    end
+  end
+end

data/lib/minke/config/reader.rb

@@ -25,13 +25,13 @@ module Minke
         config.docker_registry = read_docker_registry file['docker_registry'] unless file['docker_registry'] == nil
         config.docker          = read_docker_section file['docker']           unless file['docker'] == nil
 
-        config.fetch    = read_task_section file['fetch'], config.docker    unless file['fetch'] == nil
-        config.build    = read_task_section file['build'], config.docker    unless file['build'] == nil
-        config.test     = read_task_section file['test'], config.docker     unless file['test'] == nil
-        config.run      = read_task_section file['run'], config.docker      unless file['run'] == nil
-        config.cucumber = read_task_section file['cucumber'], config.docker unless file['cucumber'] == nil
-
-        config.shell = read_task_section file['shell'], config.docker unless file['shell'] == nil
+        config.fetch     = read_task_section file['fetch'],     config.docker unless file['fetch'] == nil
+        config.build     = read_task_section file['build'],     config.docker unless file['build'] == nil
+        config.test      = read_task_section file['test'],      config.docker unless file['test'] == nil
+        config.run       = read_task_section file['run'],       config.docker unless file['run'] == nil
+        config.cucumber  = read_task_section file['cucumber'],  config.docker unless file['cucumber'] == nil
+        config.shell     = read_task_section file['shell'],     config.docker unless file['shell'] == nil
+        config.provision = read_task_section file['provision'], config.docker unless file['provision'] == nil
 
         return config
       end
@@ -58,12 +58,13 @@ module Minke
 
       def read_task_section section, docker_config
         Task.new.tap do |t|
-          t.consul_loader = read_consul_loader_section section['consul_loader'] unless section['consul_loader'] == nil
-          t.health_check  = read_url section['health_check']  unless section['health_check'] == nil
-          t.docker        = read_docker_section section['docker'] unless section['docker'] == nil
-          t.pre           = read_pre_post_section section['pre']  unless section['pre'] == nil
-          t.post          = read_pre_post_section section['post'] unless section['post'] == nil
-          t.ports         = section['ports'] unless section['ports'] == nil
+          t.consul_loader = read_consul_loader_section section['consul_loader']  unless section['consul_loader'] == nil
+          t.health_check  = read_url section['health_check']                     unless section['health_check'] == nil
+          t.docker        = read_docker_section section['docker']                unless section['docker'] == nil
+          t.pre           = read_pre_post_section section['pre']                 unless section['pre'] == nil
+          t.post          = read_pre_post_section section['post']                unless section['post'] == nil
+          t.ports         = section['ports']                                     unless section['ports'] == nil
+          t.terraform     = read_terraform_section section['terraform']          unless section['terraform'] == nil
         end
       end
 
@@ -90,6 +91,25 @@ module Minke
         end
       end
 
+      def read_terraform_section section
+        TerraformSettings.new.tap do |t|
+          t.config_dir = section['config_dir']
+          t.environment = read_env_vars section['environment'] unless section['environment'] == nil
+        end
+      end
+
+      def read_env_vars section
+        env = EnvironmentSettings.new
+
+        section.each do |e|
+          e.each do |k,v|
+            env[k]  = v.is_a?(Hash) ? read_secure(v) : v
+          end
+        end
+
+        env
+      end
+
       def read_url section
         URL.new.tap do |url|
           url.address  = section['address']

data/lib/minke/config/task.rb

@@ -0,0 +1,53 @@
+module Minke
+  module Config
+   
+    # Task encapsulates the configuration for the various rake tasks like build, run, etc.
+    class Task
+      ##
+      # consul_loader will specify that the given config file is loaded into Consul.
+      # instance of Minke::Config::ConsulLoader
+      #
+      # [Optional]
+      attr_accessor :consul_loader
+
+      ##
+      # health_check is the string representation of a url to check before continuing with the rest of the
+      # task a successfull 200 response from the endpoint is required to contine.
+      #
+      # [Optional]
+      attr_accessor :health_check
+
+      ##
+      # pre tasks will run before the main task executes.
+      # instance of Minke::Config::TaskRunSettings
+      #
+      # [Optional]
+      attr_accessor :pre
+
+      ##
+      # post tasks will run after the main task executes.
+      # instance of Minke::Config::TaskRunSettings
+      #
+      # [Optional]
+      attr_accessor :post
+
+      ##
+      # docker config allows you to override the main docker configuration on a per task basis.
+      # instance of Minke::Config::TaskRunSettings
+      #
+      # [Optional]
+      attr_accessor :docker
+
+      ##
+      # ports contains an array of Minke::Config::ContainerAddress which holds the details
+      # for the address the public and private ports of any containers which will be started by this
+      # task.
+      attr_accessor :ports
+
+      ##
+      # terraform contains the an instance of Minke::Config::TerraformSettings which
+      # contains the details for the terraform provisioning section.
+      attr_accessor :terraform
+    end
+  end
+end

data/lib/minke/config/task_run_settings.rb

@@ -0,0 +1,22 @@
+module Minke
+  module Config
+    ##
+    # TaskRunSettings encapsulates the configuration for the various pre and post sections for each task.
+    # You can use this section to load config into consul, wait for a health check to complete, copy files
+    # or execute other tasks defined in your Rakefile.
+    class TaskRunSettings
+      ##
+      # tasks is an array of strings which point to a defined task in your Rakefile.
+      #
+      # [Optional]
+      attr_accessor :tasks
+
+      ##
+      # copy is an array of Copy instances which will be copied before the task continues.
+      # instance of Minke::Config::Copy
+      #
+      # [Optional]
+      attr_accessor :copy
+    end
+  end
+end

data/lib/minke/config/terraform.rb

@@ -0,0 +1,21 @@
+module Minke
+  module Config
+
+    class TerraformSettings
+      ##
+      # config_dir is the relative folder containing your terraform config.
+      attr_accessor :config_dir
+
+      ##
+      # environment contains the environment variable settings to be used with
+      # terraform provisioning, this can include:
+      # AWS_ACCESS_KEY_ID
+      # AWS_SECRET_ACCESS_KEY
+      # AWS_DEFAULT_REGION
+      #
+      # The secure feature of minke can also be used to encrypt these values
+      # with a private key.
+      attr_accessor :environment
+    end
+  end
+end

data/lib/minke/config/url.rb

@@ -0,0 +1,33 @@
+module Minke
+  module Config
+    ##
+    # URL represents a url object which is used for health_check and consul_loader locations
+    class URL
+      ##
+      # address of the server i.e 127.0.0.1 or the docker name consul
+      attr_accessor :address
+
+      ##
+      # port which the server is running on
+      # default 80
+      attr_accessor :port
+
+      ##
+      # protocol for the server
+      # - http [default]
+      # - https
+      attr_accessor :protocol
+
+      ##
+      # path for the server
+      # default /
+      attr_accessor :path
+
+      ##
+      # type of the URL
+      # - public
+      # - private used for linked containers
+      attr_accessor :type
+    end
+  end
+end

data/lib/minke/scripts/minke

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MINKE_VERSION="1.14.5"
+MINKE_VERSION="1.15.0"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -29,6 +29,14 @@ fi
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
 
+# Do we need to forward an ssh key for encrypt?
+MOUNT_VOLUME=""
+while getopts 'Avm:v' flag; do
+  if [[ $flag == "m" ]]; then
+    SSH_KEY="-v ${OPTARG}"
+  fi
+done
+
 if [[ $1 != \generate* ]]; then
   # Test if we need to mount any special volumes for paths specified in the Gemfile
   while read -r line; do
@@ -40,7 +48,7 @@ if [[ $1 != \generate* ]]; then
 
   DIR=$(dirname `pwd`)
   
-  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${SSH_AUTH} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e BUNDLE_PATH=${PWD}/vendor -e BUNDLE_JOBS=2 -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_minke ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${SSH_AUTH} ${GEM_VOLUMES} ${SSH_KEY} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e BUNDLE_PATH=${PWD}/vendor -e BUNDLE_JOBS=2 -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_minke ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
   id=$(docker network create minke_${NEW_UUID})

data/lib/minke/tasks/task.rb

@@ -17,7 +17,7 @@ module Minke
         @docker_network         = args[:docker_network]
         @health_check           = args[:health_check]
         @service_discovery      = args[:service_discovery]
-        @task_settings          = @config.send(@task_name)
+        @task_settings          = @config.send(@task_name) unless @task_name == :push
       end
 
       ##

data/lib/minke/tasks/terraform.rb

@@ -0,0 +1,23 @@
+module Minke
+  module Tasks
+    class Terraform < Task
+
+      def run args
+        @logger.info "## Provision application " + args
+
+        if @task_settings.terraform.environment != nil
+          @logger.info "### Setting environment variables "
+          @task_settings.terraform.environment.each do |e|
+            ENV[e[0]] = e[1]
+          end
+        end
+
+        Dir.chdir @task_settings.terraform.config_dir do
+          @shell_helper.execute "echo yes | terraform #{args}", true
+        end
+      end
+
+    end
+  end
+end
+

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.14.5"
+  VERSION = "1.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.15.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,7 +252,16 @@ files:
 - lib/minke.rb
 - lib/minke/command.rb
 - lib/minke/config/config.rb
+- lib/minke/config/consul_loader.rb
+- lib/minke/config/copy.rb
+- lib/minke/config/docker_registry_settings.rb
+- lib/minke/config/docker_settings.rb
+- lib/minke/config/environment_settings.rb
 - lib/minke/config/reader.rb
+- lib/minke/config/task.rb
+- lib/minke/config/task_run_settings.rb
+- lib/minke/config/terraform.rb
+- lib/minke/config/url.rb
 - lib/minke/docker/consul.rb
 - lib/minke/docker/docker_compose.rb
 - lib/minke/docker/docker_runner.rb
@@ -282,6 +291,7 @@ files:
 - lib/minke/tasks/shell.rb
 - lib/minke/tasks/task.rb
 - lib/minke/tasks/task_runner.rb
+- lib/minke/tasks/terraform.rb
 - lib/minke/tasks/test.rb
 - lib/minke/version.rb
 - minke.gemspec