panoramix 0.7.15 → 0.7.16

data/lib/panoramix/plugin/base.rb

@@ -30,7 +30,7 @@ module Panoramix
 			end
 
 			def shell(cmd, silent=false, env=Hash.new)
-	      puts "Running #{cmd}".magenta if ENV["VERBOSE"]
+	      puts "Running #{cmd}  ENV=#{env}".magenta if ENV["VERBOSE"]
 
 	      @err = ""
 	      @out = ""

data/lib/panoramix/plugin/docker_build.rb

@@ -6,10 +6,13 @@ module Panoramix
     class DockerBuild < DockerImageBase
 
       attr_reader :src
+      attr_reader :env
 
-      def initialize(dst, src)
-        super(dst)
+      def initialize(dst, src, host)
+        super(dst, host)
         @src = src
+        @env = Hash.new
+        @env["DOCKER_HOST"] = "tcp://#{host}" if host
       end
 
       # When this instance needs to be executed
@@ -20,7 +23,7 @@ module Panoramix
 
       # Default action for this task
       def run_default
-        shell "docker build -t #{dst} #{File.dirname(@src)}"
+        shell("docker build -t #{dst} #{File.dirname(@src)}", false, @env)
       end
 
       def ps
@@ -56,6 +59,9 @@ def docker_build(args, &block)
     raise message
   end
 
+  # Select the host
+  host = config.fetch(:host, nil)
+
   # Select provided dependencies
   prerequisites = args[name].select { |d| ! d.is_a? Hash }
 
@@ -63,7 +69,7 @@ def docker_build(args, &block)
   prerequisites = prerequisites.push(dockerfile) unless dockerfile.nil?
   prerequisites.flatten!
 
-  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile)
+  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile, host)
 
   descriptions = I18n.t('docker_build')
   descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/docker_image.rb

@@ -6,10 +6,13 @@ module Panoramix
 		class DockerImage < DockerImageBase
 
 			attr_reader :src
+			attr_reader :env
 
-			def initialize(dst, src)
-				super(dst)
+			def initialize(dst, src, host)
+				super(dst, host)
 				@src = src
+				@env = Hash.new
+				@env["DOCKER_HOST"] = "tcp://#{host}" if host
 			end
 
 			# When this instance needs to be executed
@@ -19,13 +22,13 @@ module Panoramix
 
 			# Default action for this task
 			def run_default
-				shell "docker pull #{@src}" unless ENV["NO_PULL"]
+				shell("docker pull #{@src}", false, @env) unless ENV["NO_PULL"]
 
 				# Tag image with required tag
-				shell "docker tag #{@src} #{@dst}"
+				shell("docker tag #{@src} #{@dst}", false, @env)
 
 				# Remove origin image
-				shell "docker rmi #{@src}"
+				shell("docker rmi #{@src}", false, @env)
 			end
 
 			def ps
@@ -42,9 +45,11 @@ def external_docker_image(args, block)
 	name = args.keys[0]
 	src = args[name][:dockerimage] || args[name][:docker]
 
+	host = args[name][:host] || nil
+
 	prerequisites = []
 
-	instance = Panoramix::Plugin::DockerImage.new(name, src)
+	instance = Panoramix::Plugin::DockerImage.new(name, src, host)
 
 	descriptions = I18n.t('docker_image')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/docker_image_base.rb

@@ -7,10 +7,14 @@ module Panoramix
     class DockerImageBase < Base
 
       attr_reader :dst
+      attr_reader :tag
+      attr_reader :env
 
-      def initialize(dst)
+      def initialize(dst, host)
         @dst = dst
         @tag = "latest"
+        @env = Hash.new
+        @env["DOCKER_HOST"] = "tcp://#{host}" if host
       end
 
       # Return timestamp of the image
@@ -19,7 +23,7 @@ module Panoramix
         if info
           # Get image timestamp
           id = info.split(" ")[0]
-          time = shell("docker inspect -f {{.Created}} #{id}", true)[:out]
+          time = shell("docker inspect -f {{.Created}} #{id}", true, @env)[:out]
           return Time.parse(time)
         else
           return Time.at 0
@@ -30,7 +34,7 @@ module Panoramix
       def created?
         return @created if @created
         
-        info = shell("docker images", true)[:out]
+        info = shell("docker images", true, @env)[:out]
 
         images_list = info.split("\n")
         images_list.shift
@@ -44,7 +48,7 @@ module Panoramix
         info = created?
         if info
           id = info.split(" ")[0]
-          shell "docker rmi -f #{id}"
+          shell("docker rmi -f #{id}", false, @env)
         end 
       end
 

data/lib/panoramix/plugin/docker_up.rb

@@ -12,10 +12,13 @@ module Panoramix
 			attr_reader :src
 			attr_reader :env
 
-			def initialize(dst, src, env)
+			def initialize(dst, src, env, host)
 				@dst = dst
 				@src = src
 				@env = env
+
+				@env = parse_env @env.keys
+				@env["DOCKER_HOST"] = "tcp://#{host}" unless host.nil?
 			end
 
 			# Return current timestamp for the container
@@ -54,7 +57,6 @@ module Panoramix
 
 			# Default action for this task
 			def run_default
-				@env = parse_env @env.keys
 				# Raise an exception if already has been created
 				if created?
 					message = I18n.t('errors.docker_up.cluster_deployed', {:id => @dst})
@@ -108,7 +110,7 @@ module Panoramix
 	    	puts "Service: #{@dst}"
 				if created?
           puts "Timestamp: #{timestamp}"
-          info = shell("docker-compose -p #{@dst} -f #{@src} ps", true, @env)[:out]
+          info = shell("#{@compose} -p #{@dst} -f #{@src} ps", true, @env)[:out]
 		    	puts info
 				else
 					puts "Timestamp: Not created"
@@ -153,11 +155,14 @@ def docker_up(args, &block)
 	# Get environment
 	environment = parse_env(compose_params.first[:env] || [])
 
+	 # Select the host
+  host = compose_params[0].fetch(:host, nil)
+
 	# Merge deps with the compose file_task
 	prerequisites = deps.select { |d| ! d.is_a? Hash }
 	prerequisites = prerequisites.push(compose)
 
-	instance = Panoramix::Plugin::DockerUp.new(name, compose, environment)
+	instance = Panoramix::Plugin::DockerUp.new(name, compose, environment, host)
 
 	descriptions = I18n.t('docker_up')
 	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.15
+  version: 0.7.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -113,25 +113,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/panoramix/dsl.rb
-- lib/panoramix/tasks/global_tasks.rb
-- lib/panoramix/tasks/task_mpi.rb
-- lib/panoramix/tasks/actions.rb
+- lib/panoramix.rb
+- lib/panoramix/locale.rb
+- lib/panoramix/plugin/cfn.rb
 - lib/panoramix/plugin/docker_image.rb
-- lib/panoramix/plugin/base.rb
-- lib/panoramix/plugin/env.rb
-- lib/panoramix/plugin/docker_image_base.rb
 - lib/panoramix/plugin/docker_up.rb
-- lib/panoramix/plugin/docker_build.rb
 - lib/panoramix/plugin/s3.rb
-- lib/panoramix/plugin/cfn.rb
 - lib/panoramix/plugin/git.rb
+- lib/panoramix/plugin/base.rb
+- lib/panoramix/plugin/env.rb
+- lib/panoramix/plugin/docker_build.rb
+- lib/panoramix/plugin/docker_image_base.rb
 - lib/panoramix/plugin/wget.rb
-- lib/panoramix/locale.rb
-- lib/panoramix/mpi.rb
+- lib/panoramix/dsl.rb
 - lib/panoramix/external.rb
+- lib/panoramix/tasks/task_mpi.rb
+- lib/panoramix/tasks/global_tasks.rb
+- lib/panoramix/tasks/actions.rb
+- lib/panoramix/mpi.rb
 - lib/panoramix/panoramix_core.rb
-- lib/panoramix.rb
 - locales/en.yml
 homepage: https://github.com/sflyr
 licenses: