dockerun 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e780ee279842afa1d97ce5bd7aa09961d35f8fd5510ff86551d8701ee7d33475
-  data.tar.gz: 3a3f2e91045841ef670b4a1e01d28ccd75f0f5d7452a7e25807ac2b1a76f2468
+  metadata.gz: d56f73dfb5c9d69bf40fc5390cf7f97fe1d372741876849c93f18c736c4cfd74
+  data.tar.gz: 9a04ddab0fd5c33068f5d94d91a38cae34662b00efe41ec3d5dbb64d9050b5ff
 SHA512:
-  metadata.gz: da62e413cd4d6dc7c78402cd5a48b31ad7896d98266d64678b3cfea24888140a1fa2e3162f9d7316852d0886288f3a3362f61c11c39293b15c797fea97e2eb3d
-  data.tar.gz: 97bfaf132fd15ee8dbee661b9fc5e274019f7c31e6d91480fcb9212e90d84d595d8a359e37f4336c4cc2b15877178e0ad5f6ed4a1409b0140836e4a3f0e7d495
+  metadata.gz: 67558d361248855d989b111878b00f43f6180b04bfb2f541b1491f8fb67e281c13e66398d5d9005a9ecd27710ce2353bea650555c40d6c5c96aa136b521db69a
+  data.tar.gz: cdf8d67ba8487b7b6425387c10cf444885f1729230559de48033f9182d330ee1a7b14e570feb33550e7efe209ab00e436365b46b145323cc3b45bfde5062ef0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dockerun (0.3.5)
+    dockerun (0.3.6)
       colorize
       docker-cli (>= 0.3.1)
       teLogger

data/lib/dockerun/command/run.rb

@@ -152,6 +152,7 @@ module Dockerun
           contNames = config.container_names(imageName)
 
           selContName = nil
+          port_mapping = {}
           if contNames.length == 0
             selContName = nil
           elsif contNames.length == 1
@@ -173,7 +174,7 @@ module Dockerun
             end
           end
 
-          selContName = run_docker_container(imageName, selContName, mount_points) do |ops, *args|
+          selContName, otherConfigs = run_docker_container(imageName, selContName, mount_points) do |ops, *args|
             case ops
             when :new_container_name
               cli.ask("\n Please provide a new container name : ".yellow, required: true)
@@ -210,6 +211,10 @@ module Dockerun
 
           config.add_container(imageName, selContName)
 
+          config.add_mount_to_container(imagename, selContName, mount_points)
+
+          config.add_port_mapping_to_container(imagename, selContName, @otherConfigs[:port_mapping]) if not_empty?(@otherConfigs[:port_mapping])
+
           config.to_storage
 
         end 

data/lib/dockerun/command/run_new_container.rb

@@ -49,7 +49,7 @@ module Dockerun
             end
           end
 
-          contName = run_docker_container(imageName, nil) do |ops, *args|
+          contName, otherConfigs = run_docker_container(imageName, nil) do |ops, *args|
             case ops
             when :new_container_name
               cli.ask("Please provide a new container name : ", required: true)

data/lib/dockerun/command/run_new_image.rb

@@ -55,7 +55,7 @@ module Dockerun
 
           contNames = config.container_names(imageName)
 
-          selContName = run_docker_container(imageName, selContName) do |ops, *args|
+          selContName, otherConfigs = run_docker_container(imageName, selContName) do |ops, *args|
             case ops
             when :new_container_name
               cli.ask("Please provide a new container name : ", required: true)

data/lib/dockerun/config.rb

@@ -72,7 +72,12 @@ module Dockerun
     def add_mount_to_container(imageName, container, mount)
       add_container(imageName, container)
       @images[imageName][container][:mount] = [] if @images[imageName][container][:mount].nil?
-      @images[imageName][container][:mount] << mount
+      case mount.class
+      when Array
+        @images[imageName][container][:mount]concat(mount)
+      else
+        @images[imageName][container][:mount] << mount
+      end
     end
 
     def container_mount_points(imageName, container)
@@ -84,6 +89,18 @@ module Dockerun
       end
     end
 
+    def add_port_mapping_to_container(imageName, container, port_mapping)
+      add_container(imageName, container)
+      @images[imageName][container][:port_mapping] = [] if @images[imageName][container][:port_mapping].nil?
+      case mount.class
+      when Array
+        @images[imageName][container][:port_mapping]concat(port_mapping)
+      else
+        @images[imageName][container][:port_mapping] << port_mapping
+      end
+    end
+
+
     def to_storage
       res = { images: @images } 
 

data/lib/dockerun/docker_container_helper.rb

@@ -49,6 +49,7 @@ module Dockerun
           #end
         end
 
+        @other_configs = {}
         if reuse == true
         
           Dockerun.udebug "Find out of container '#{container_name}' is running..." 
@@ -143,13 +144,21 @@ module Dockerun
 
           #end
 
+          addPortMapping = block.call(:add_port_mapping?)
+          port_mapping = {}
+          if addPortMapping
+            portOnHost = block.call(:port_on_host)
+            portOnDocker = block.call(:port_on_docker)
+            port_mapping[portOnHost] = portOnDocker
+          end
 
+          @other_configs[:port_mapping] = port_mapping if not_empty?(port_mapping)
 
-          dcFact.create_container_from_image(image_name, interactive: true, tty: true, container_name: container_name, mount: mount_points).run
+          dcFact.create_container_from_image(image_name, interactive: true, tty: true, container_name: container_name, mount: mount_points, ports: port_mapping).run
 
         end
 
-        container_name
+        [container_name, @other_configs]
 
       end
 

data/lib/dockerun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dockerun
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ian