panoramix 0.7.19 → 0.7.20

data/lib/panoramix/plugin/docker_build.rb

@@ -5,12 +5,14 @@ module Panoramix
 
     class DockerBuild < DockerImageBase
 
-      attr_reader :src
       attr_reader :env
+      attr_reader :context
+      attr_reader :dockerfile
 
-      def initialize(dst, src, host)
+      def initialize(dst, dockerfile, context, host)
         super(dst, host)
-        @src = src
+        @dockerfile = dockerfile 
+        @context = context
         @env = Hash.new
         @env["DOCKER_HOST"] = "tcp://#{host}" if host
       end
@@ -23,7 +25,7 @@ module Panoramix
 
       # Default action for this task
       def run_default
-        shell("docker build -t #{dst} #{File.dirname(@src)}", false, @env)
+        shell("docker build -t #{dst} -f #{@dockerfile} #{@context}", false, @env)
       end
 
       def ps
@@ -36,7 +38,6 @@ module Panoramix
 end
 
 def docker_image(args, block=nil)
-
   puts "Warning using obsolete docker_image
     \t => #{"docker_image".bold} <image_name> => {dockerfile: <path_dockerfile>}.\n\tchange to:
     \t => #{"docker_build".bold} <image_name> => {dockerfile: <path_dockerfile>}".red
@@ -59,6 +60,9 @@ def docker_build(args, &block)
     raise message
   end
 
+  # Get context if given
+  context = config.fetch(:context, ".")
+
   # Select the host
   host = config.fetch(:host, nil)
 
@@ -69,7 +73,7 @@ def docker_build(args, &block)
   prerequisites = prerequisites.push(dockerfile) unless dockerfile.nil?
   prerequisites.flatten!
 
-  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile, host)
+  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile, context, host)
 
   descriptions = I18n.t('docker_build')
   descriptions = Hash.new if descriptions.class != Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoramix
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry