dockerun 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777e1a207665d2cb3e4418a2890441779663c1fe5eb39dd49f498a4445213cff
-  data.tar.gz: a81b53e08e2e3e109104f05545e6f30f12bd2dc10590f6bd356180f8e4b919cd
+  metadata.gz: d56f73dfb5c9d69bf40fc5390cf7f97fe1d372741876849c93f18c736c4cfd74
+  data.tar.gz: 9a04ddab0fd5c33068f5d94d91a38cae34662b00efe41ec3d5dbb64d9050b5ff
 SHA512:
-  metadata.gz: c55faea206d5bcddaee2c78d82aa101e15279236c749a43c43614aa840f4e48c7fdf02f0285207c84d76ce2cd53aa6b99974cffbaa2f035617f3ce7276522eb1
-  data.tar.gz: 0d666b21e41d00232f0af9354877419e6479b09286fb219369ae528b1fbb5b185d8ef85af5f695b9f85f5c3fca332f1347ef9b042fb1bf70e83ae9ab00cfb927
+  metadata.gz: 67558d361248855d989b111878b00f43f6180b04bfb2f541b1491f8fb67e281c13e66398d5d9005a9ecd27710ce2353bea650555c40d6c5c96aa136b521db69a
+  data.tar.gz: cdf8d67ba8487b7b6425387c10cf444885f1729230559de48033f9182d330ee1a7b14e570feb33550e7efe209ab00e436365b46b145323cc3b45bfde5062ef0a

data/.release_history.yml

@@ -52,3 +52,5 @@ dockerun:
   :timestamp: 1680596515.6388657
 - :version: 0.3.3
   :timestamp: 1680598096.8177018
+- :version: 0.3.4
+  :timestamp: 1680600334.3304904

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dockerun (0.3.4)
+    dockerun (0.3.6)
       colorize
       docker-cli (>= 0.3.1)
       teLogger
@@ -27,7 +27,7 @@ GEM
       toolrack
       tty-command
       tty-prompt
-    git_cli (0.11.2)
+    git_cli (0.11.4)
       gvcs
       ptools (~> 1.4.0)
       teLogger
@@ -36,11 +36,19 @@ GEM
       teLogger
       toolrack
       tty-prompt
-    gvcs (0.1.1)
+    gvcs (0.1.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
     rake (13.0.6)
+    release-gem (0.1.18)
+      colorize
+      git_cli
+      gvcs
+      teLogger
+      toolrack
+      tty-command
+      tty-prompt
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -55,7 +63,7 @@ GEM
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
     teLogger (0.2.2)
-    toolrack (0.21.0)
+    toolrack (0.22.1)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
@@ -79,6 +87,7 @@ DEPENDENCIES
   devops_assist
   dockerun!
   rake (~> 13.0)
+  release-gem
   rspec (~> 3.0)
 
 BUNDLED WITH

data/Rakefile

@@ -8,3 +8,4 @@ require 'devops_assist'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+require 'release/gem'

data/dockerun.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_development_dependency 'release-gem'
 end

data/lib/dockerun/command/run.rb

@@ -115,9 +115,6 @@ module Dockerun
             when :add_to_bundle?
               cli.yes?("\n Add directory '#{val.first}' to bundler config local? ".yellow)
 
-            when :add_mount_to_container
-              config.add_mount_to_container(imageName, *val)
-
             when :add_more_volume_mapping?
               cli.yes?("\n Add more volume mapping? ".yellow)
 
@@ -155,6 +152,7 @@ module Dockerun
           contNames = config.container_names(imageName)
 
           selContName = nil
+          port_mapping = {}
           if contNames.length == 0
             selContName = nil
           elsif contNames.length == 1
@@ -176,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)
@@ -213,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

@@ -10,12 +10,13 @@ module Dockerun
     def self.from_storage
       path = File.join(Dir.getwd, FILENAME)
       if File.exist?(path)
-        cont = nil
-        File.open(path,"r") do |f|
-          cont = f.read
-        end
+        #cont = nil
+        #File.open(path,"r") do |f|
+        #  cont = f.read
+        #end
 
-        Config.new(YAML.load(cont), true)
+        #Config.new(YAML.load(cont), true)
+        Config.new(YAML.unsafe_load_file(path), true)
       else
         Config.new({}, false)
       end
@@ -71,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)
@@ -83,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/docker_image_helper.rb

@@ -239,7 +239,6 @@ module Dockerun
               @shared_dirs[File.basename(dest)] = dest
             end
 
-            block.call(:add_mount_to_container, container_name, mount.last)
             repeat = block.call(:add_more_volume_mapping?)
             break if not repeat
 
@@ -248,6 +247,9 @@ module Dockerun
         end
 
 
+        # 
+        # Try to run once to install bundle config --local and create alias during image building
+        #
         insideDockerConfig = File.join(File.dirname(__FILE__),"..","..","template","setup_ruby_devenv.rb.erb")
         if File.exist?(insideDockerConfig)
 

data/lib/dockerun/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: release-gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - cameronian0@protonmail.com