minke 1.8.3 → 1.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUyYTNhOWE0ODZiYjRjODM0MjY5ODBmZDk3ZjU5MzczOGVkZmIyNw==
+    NzcxNDdkYWEzOGQyM2ZlYjVkYTYwYzYxZmI2MGU5ODI2OTk5YzI5MA==
   data.tar.gz: !binary |-
-    YjhjMzlkZTgzMTkxZGQwNjc2MjYyMmNiZjg5MWM4ZTU2OTVkNjczNg==
+    MmJhOTlmOWU2YTBjZmYyNTFiZjZhMzY0ZWExZTUyMjFmNzE5ZTYwOA==
 SHA512:
   metadata.gz: !binary |-
-    MjFhZjM1NjJkY2MwMzZjNDIwNjg2YjJlNmY3MDJkZWNkMTg3NDRjZDlhNDVh
-    NTliNWExYTM3ZmVmZDI4Zjg3NjgyMDUwZjgyMGQxYmRiOWE0ZTUwNmMzZGYz
-    NzkwMDQ3ZDQ4NDY2ZTdjNTE4YzBlZWZlN2FkYTFjNGY3MGY5NGM=
+    ZmIxOTNmNzk1ZWUyNzM5MGM0Yjc1MmI0YjcwYjgwZjIzZDk5ZTIyMGM5MTZm
+    OGM3ZTcyOWM2ZTA3MjY5ZTFkOGUwZWZmZmNmZGFhZDYwYmI4MmYxY2YxMzkx
+    ODQwMGFiYTRkMWVhODFhOWU4MWFjZjYwYmIwZDAyZDVhZTllODQ=
   data.tar.gz: !binary |-
-    OTlhYmQzODNiMjg1OGI1NDFlZDVkMTQ5NjQ1YTcxMjExYjRjOTcwMTBiYTcw
-    OTM3NDM0M2I0OWJiMDIyNmFlNDI4MDBiY2FiMGIxMmFiNTgwNDYzNzAxZDIz
-    ZDQxODI3Y2NhMGRjYzNjM2JmZDc0MGYwNDY2NDRlMDlmZDcyYjE=
+    ZmZkNDgwYmIxZGRjYzE0OWM0MDYzOTBjMGYxNGUzOWMxNmM4MzJhMGFjNjQy
+    MTBlZTg0MjBlM2U2OWZlMzRjYmU4NzA3OGE1YWVkNTA3MWRlNGIwZTJkYzBk
+    MjllZjgzMzIzZjc0YjM5YTc4ZjNlNTJjYjFlOGY3YTI5NjFiZWU=

data/lib/minke.rb

@@ -41,6 +41,7 @@ require 'minke/generators/config_processor'
 require 'minke/generators/config_variables'
 require 'minke/generators/processor'
 require 'minke/generators/register'
+require 'minke/generators/shell_script.rb'
 
 require 'minke/encryption/encryption'
 require 'minke/encryption/key_locator'

data/lib/minke/generators/processor.rb

@@ -26,6 +26,9 @@ module Minke
 
           run_command_in_container image, generator.generate_settings.command unless generator.generate_settings.command == nil
         end
+
+        # write the shell script
+        Minke::Generators::write_bash_script output_folder + "/_build/minke.sh"
       end
 
       def build_image docker_file

data/lib/minke/generators/shell_script.rb

@@ -0,0 +1,34 @@
+module Minke
+  module Generators
+    SCRIPT = <<-EOF
+    #!/bin/bash
+
+    DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
+    BUNDLE_COMMAND="set :bundle_flags, \"--path \#{shared_path}/bundles --quiet\" && bundle install -j3 && bundle update"
+    ERROR="Please specify a command e.g. ./minke.sh rake app:test"
+    COMMAND=""
+    NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
+
+    if [ "$1" == '' ]; then
+      echo $ERROR;
+      exit 1;
+    fi
+
+    COMMAND=$*
+    DIR=$(dirname `pwd`)
+
+    echo "Running command: ${COMMAND}"
+
+    eval "docker network create minke_${NEW_UUID}"
+    eval "docker run --rm -it --net=minke_${NEW_UUID} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build nicholasjackson/minke /bin/bash -c '${BUNDLE_COMMAND} && ${COMMAND}'"
+    eval "docker network rm minke_${NEW_UUID}"
+    EOF
+
+    def write_bash_script path
+      File.write(path, SCRIPT)
+      File.chmod(0755, path)
+    end
+
+    module_function :write_bash_script
+  end
+end

data/lib/minke/rake/app.rake

@@ -6,7 +6,7 @@ namespace :app do
 
     if @config.fetch != nil
       puts 'run fetch'
-      runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::Fetch.new @config, :fetch, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -16,7 +16,7 @@ namespace :app do
     create_dependencies
 
     if @config.build != nil
-      runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::Build.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -26,7 +26,7 @@ namespace :app do
     create_dependencies
 
     if @config.test != nil
-      runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::Test.new @config, :test, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -36,7 +36,7 @@ namespace :app do
     create_dependencies
 
     if @config.build != nil
-      runner = Minke::Tasks::BuildImage.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+      runner = Minke::Tasks::BuildImage.new @config, :build, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
       runner.run
     end
   end
@@ -67,7 +67,7 @@ namespace :app do
   desc "push built image to Docker registry"
   task :push  do
     create_dependencies
-    runner = Minke::Tasks::Push.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @logger, @helper
+    runner = Minke::Tasks::Push.new @config, :cucumber, @generator_config, @docker_runner, @docker_compose_factory, @service_discovery, @logger, @helper
     runner.run
   end
 

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.8.3"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Nic Jackson
@@ -219,6 +219,7 @@ files:
 - lib/minke/generators/config_variables.rb
 - lib/minke/generators/processor.rb
 - lib/minke/generators/register.rb
+- lib/minke/generators/shell_script.rb
 - lib/minke/helpers/helper.rb
 - lib/minke/rake/app.rake
 - lib/minke/rake/config.rake