dockerun 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3708d3f0eacf918a4dfc777b56877f3b5b5c8cfafb12788d24e15e4f053a6349
-  data.tar.gz: 2d55bcc161e746f6e06bcd17df6d57ad8577cf27e6cea161e789503137e11406
+  metadata.gz: 1ccd48be4fd82ee86c3b6deb93c7a8be20cbbb59a2ec78787a61a37a9475efee
+  data.tar.gz: 45a7edef9b777709cd1fd00023fcc8b85b936a4ac9bd3c6ff33e947e3aa0f670
 SHA512:
-  metadata.gz: a86514ff23b8d55d047acf3ef7dea424088a9111ec61aa8380104df8e6bc2bb5af26da7d1aaa01b48b225dddfed7ca8b226b7b085bbdb43c42bd48e783ee5f60
-  data.tar.gz: a75eba6dd5f4ed44e7d4b0af4c972e6d25cdbdf9e0d45d26b5a28bf46bb0d05ae1da3130b92d3897414564f35c5086d6a723cb818cdd9e2c386bfe778748bc74
+  metadata.gz: ca7b6356dfda231e2a6df168dbc56b7ce4dd6c89abf2021f131a9275161ddfb1fe0565508e203005b42a3a9e9f0fc97c87169480694aece85a1555232a4a4f7f
+  data.tar.gz: e2633ace5cc2be1e2c38fa6fedce959dfbc56897db28f67254ab9224db35f115ab5071f9c28227ce43851eef8a5292cb5d0929a463118908649ff8451fc7c200

data/.release_history.yml

@@ -30,6 +30,8 @@ dockerun:
   :timestamp: 1670649972.645625
 - :version: 0.1.14
   :timestamp: 1670677180.3442845
+- :version: 0.1.15_mac
+  :timestamp: 1679552032.751968
 - :version: 0.1.15
   :timestamp: 1679980468.4161575
 - :version: 0.1.16

data/Dockerfile.dockerun

@@ -1,15 +1,9 @@
 
-FROM ruby:2.7.6
-LABEL version="0.1"
-LABEL maintainer="chris"
-LABEL description="Dockerfile generated by dockerun" 
-LABEL dockerun-info="https://github.com/chrisliaw/dockerun"
-
-
-RUN apt-get update && apt-get install -y sudo git curl build-essential vim
-
-
+FROM jruby:9.4.0-jdk11
+LABEL version="0.1" description="Dockerfile generated by dockerun" maintainer="chris"
 
+# Dockerfile entries here
+RUN apt-get update && apt-get install -y sudo 
 
 RUN groupadd -f -g 1000  chris && \ 
     useradd -u 1000 -g 1000 -m chris && \
@@ -18,22 +12,8 @@ RUN groupadd -f -g 1000  chris && \
 
 USER chris
 
-# from this point onwards, sudo is required for privileaged operation
-#RUN sudo apt-get install -y curl build-essential
-
-
-COPY on_docker_config /home/chris/docker_init.rb 
-#RUN chown chris:chris /home/chris/docker_init.rb
-RUN ruby /home/chris/docker_init.rb
-
-
-
-
-
-WORKDIR /opt
-
-
-# other Dockerfile entries starts here
+RUN sudo apt-get install -y curl git
 
+# ENTRYPOINT [ "/bin/bash" ]
+# CMD [ "/bin/bash", "--login" ]
 CMD [ "/bin/bash", "--login" ]
-

data/Gemfile

@@ -9,6 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
+#gem 'git_cli', git: "git_cli", branch: "master"
 #gem 'docker-cli', git: "docker-cli", branch: "master" 
 
 

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    dockerun (0.2.3)
+    dockerun (0.3.0)
       colorize
-      docker-cli (>= 0.1.2)
-      teLogger (> 0.2.0)
-      toolrack (> 0.19.1)
+      docker-cli
+      teLogger
+      toolrack
       tty-command
       tty-option
 
@@ -21,9 +21,10 @@ GEM
       toolrack
       tty-prompt
     diff-lcs (1.5.0)
-    docker-cli (0.2.0)
+    docker-cli (0.3.1)
       ptools
       teLogger
+      toolrack
       tty-command
       tty-prompt
     git_cli (0.11.2)
@@ -71,7 +72,7 @@ GEM
     wisper (2.0.1)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -81,4 +82,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.28
+   2.4.10

data/dockerun.gemspec

@@ -30,14 +30,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'toolrack' , '> 0.19.1'
-  spec.add_dependency 'teLogger' , '> 0.2.0'
+  spec.add_dependency 'toolrack' #, '> 0.19.1'
+  spec.add_dependency 'teLogger' #, '> 0.2.0'
 
   spec.add_dependency 'tty-command' #, "> 0.10.1"
   spec.add_dependency 'tty-option' #, "> 0.2.0"
   spec.add_dependency 'colorize'
 
-  spec.add_dependency 'docker-cli', ">= 0.1.2"
+  spec.add_dependency 'docker-cli' #, ">= 0.1.2"
 
   spec.add_development_dependency 'devops_assist'
 

data/exe/dockerun

@@ -80,6 +80,17 @@ else
       pmt.say "\n\n Aborted\n", color: :yellow
     end
 
+  when "stop", "s"
+
+    begin
+      runCmd = Dockerun::Command::StopContainer.new
+      argv = ARGV[1..-1]
+      runCmd.parse(argv).run
+    rescue TTY::Reader::InputInterrupt
+    end
+
+
+
 
   when "rmi", "remove-image"
     begin

data/lib/dockerun/cli_prompt.rb

@@ -1,4 +1,5 @@
 
+require 'colorize'
 require 'tty/prompt'
 
 module Dockerun

data/lib/dockerun/command/dockerun.rb

@@ -14,7 +14,7 @@ module Dockerun
 
       argument :command do
         required
-        desc "Command for the dockerun operations. Supported: init, run (r), run-new-container (rnc), run-new-image (rni), remove-image (rmi), remove-container (rmc)"
+        desc "Command for the dockerun operations. Supported: init, run (r), stop (s), run-new-container (rnc), run-new-image (rni), remove-image (rmi), remove-container (rmc)"
       end
 
       def run

data/lib/dockerun/command/run.rb

@@ -16,6 +16,7 @@ module Dockerun
       include CommandHelper::DockerContainerHelper
       include DockerCommandFactoryHelper
       include CommandHelper::DockerImageHelper
+      include CliHelper::CliPrompt
 
       usage do
         program "dockerun"

data/lib/dockerun/command/stop_container.rb

@@ -0,0 +1,90 @@
+
+require_relative '../cli_prompt'
+require_relative '../config'
+require_relative '../docker_container_helper'
+
+module Dockerun
+  module Command
+    
+    class StopContainer
+
+      include TTY::Option
+      include TR::CondUtils
+      include CommandHelper::DockerContainerHelper
+      include DockerCommandFactoryHelper
+      include CliHelper::CliPrompt
+
+      usage do
+        program "dockerun"
+        command "stop"
+        desc "Stop a running container"
+      end
+
+      def run(&block)
+        if params[:help]
+          print help
+          exit(0)
+
+        else
+
+          # find history file
+          config = ::Dockerun::Config.from_storage
+
+          res = []
+          opts = []
+          config.image_names.each do |im|
+            config.container_names(im).each do |cn|
+              if is_container_exist?(cn)
+                if is_container_running?(cn)
+res << "#{im} : #{cn} (Running)"
+                  opts << cn
+                else
+                  res << "#{im} : #{cn} (Not Running)"
+                end
+              else
+                res << "#{im} : #{cn} (Not Exist)"
+              end
+            end
+          end 
+
+          if not opts.empty?
+            cli.puts "\n Running status of container(s) : ".yellow
+            res.sort.each do |r|
+              cli.puts " * #{r}".yellow
+            end
+
+            cli.puts
+            selConts = cli.multi_select("Please select which container to stop : ") do |m|
+              opts.each do |o|
+                m.choice o,o
+              end
+
+              m.choice "Abort", :quit
+            end
+
+            if selConts.include?(:quit)
+              cli.puts " * Abort was one of the selected option. Command aborted.".red
+            else
+              selConts.each do |sc|
+                begin
+                  stop_container(sc)
+                  cli.puts " Container '#{sc}' stopped successfully.".green
+                rescue DockerContainerStopFailed => ex
+                  cli.puts " Container '#{sc}' failed to be stopped".red
+                end
+              end
+            end
+
+          else
+            cli.say " * There is no container found to be running * ".yellow
+          end
+
+          cli.puts "\n Stop container command completed successfully \n\n".yellow
+
+        end
+      end
+
+    end
+
+  end
+end

data/lib/dockerun/config.rb

@@ -28,9 +28,9 @@ module Dockerun
 
     def initialize(configHash = {  }, configFileAvail = false)
       @config = configHash 
-      @images = @config[:images]
+      @images = @config[:images] || {  }
       @confFileAvail = configFileAvail
-      @images = {  } if @images.nil?
+      #@images = {  } if @images.nil?
     end
 
     def isConfigFileAvail?
@@ -74,8 +74,8 @@ module Dockerun
       @images[imageName][container][:mount] << mount
     end
 
-    def mount_of_container(container)
-      res = @containers[container]
+    def container_mount_points(imageName, container)
+      res = @images[imageName][container]
       if is_empty?(res) or is_empty?(res[:mount])
         []
       else

data/lib/dockerun/docker_command_factory_helper.rb

@@ -2,6 +2,10 @@
 require 'docker/cli'
 
 module Dockerun
+
+  # 
+  # Link to CommandFactory 
+  #
   module DockerCommandFactoryHelper
     
     def dcFact

data/lib/dockerun/docker_container_helper.rb

@@ -4,21 +4,29 @@ require_relative 'bundler_helper'
 
 module Dockerun
   module CommandHelper
+
+    # 
+    # Common functions for docker container management
+    #
     module DockerContainerHelper
       include DockerCommandFactoryHelper
       include BundlerHelper
 
       class DockerContainerBuildFailed < StandardError; end
       class DockerContainerStartFailed < StandardError; end
+      class DockerContainerStopFailed < StandardError; end
 
       def run_docker_container(image_name, container_name, mount_points = [], &block)
      
         raise DockerContainerBuildFailed, "block is required" if not block
         raise DockerContainerBuildFailed, "Image name is required" if is_empty?(image_name)
 
+        Dockerun.udebug("Running image '#{image_name}', container '#{container_name}'")
+
         reuse = nil
 
         if is_empty?(container_name)
+          Dockerun.udebug "Container name empty. Creating new container"
           container_name = block.call(:new_container_name)
           loop do
             st, _ = is_container_exist?(container_name)
@@ -32,22 +40,24 @@ module Dockerun
           end
 
         else
-          st, _ = is_container_exist?(container_name)
-          if st
-            reuse = true
-          else
-            # if not found shall drop into the next block's else clause 
-          end
+          reuse, _ = is_container_exist?(container_name)
+          Dockerun.udebug "Container name not empty. Is container exist? : #{reuse}"
+          #if st
+          #  reuse = true
+          #else
+          #  # if not found shall drop into the next block's else clause 
+          #end
         end
 
         if reuse == true
         
-          # 
-          # container already exist so no configuration is required
-          #
-          res = dcFact.find_running_container(container_name).run
-          if not res.failed? and res.is_out_stream_empty?
+          Dockerun.udebug "Find out of container '#{container_name}' is running..." 
+          #res = dcFact.find_running_container(container_name).run
+          #if not res.failed? and res.is_out_stream_empty?
+          st, _ = is_container_running?(container_name)
+          if not st
             # not running
+            Dockerun.udebug "Container '#{container_name}' does not seems to be running. Starting container."
             ress = dcFact.start_container(container_name).run
             raise DockerContainerStartFailed, "Failed to start container '#{container_name}'. Error was : #{ress.err_stream}" if ress.failed?
           end
@@ -149,7 +159,6 @@ module Dockerun
           res = dcFact.find_from_all_container("^#{name}\\z").run
           raise DockerContainerBuildFailed, "Failed to find container. Error was : #{res.err_stream}" if res.failed?
 
-          p res.out_stream
           if res.is_out_stream_empty?
             # nothing found
             [false, ""]
@@ -168,6 +177,27 @@ module Dockerun
 
       end
 
+      def is_container_running?(name)
+        if not_empty?(name)
+          res = dcFact.find_running_container("^#{name}\\z").run
+          raise DockerContainerBuildFailed, "Failed to find is running container. Error was : #{res.err_stream}" if res.failed?
+
+          if res.is_out_stream_empty?
+            # nothing found
+            [false, ""]
+          else
+            [true, res.out_stream]
+          end
+        else
+          [false, nil]
+        end
+      end
+
+      def stop_container(name)
+        res = dcFact.stop_container(name).run
+        raise DockerContainerStopFailed, "Failed to stop docker container '#{name}'. Error was : #{res.err_stream}" if res.failed?
+      end
+
       
     end
   end

data/lib/dockerun/docker_image_helper.rb

@@ -6,6 +6,10 @@ require_relative 'template/template_writer'
 
 module Dockerun
   module CommandHelper
+
+    # 
+    # common functions for docker image management
+    #
     module DockerImageHelper
       include CliHelper::CliPrompt
       include DockerCommandFactoryHelper

data/lib/dockerun/version.rb

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

data/lib/dockerun.rb

@@ -15,6 +15,7 @@ require_relative 'dockerun/command/reset_image'
 require_relative 'dockerun/command/run_new_container'
 require_relative 'dockerun/command/remove_container'
 require_relative 'dockerun/command/run_new_image'
+require_relative 'dockerun/command/stop_container'
 
 require_relative 'dockerun/template/template_writer'
 require_relative 'dockerun/template/template_engine'
@@ -22,4 +23,21 @@ require_relative 'dockerun/template/template_engine'
 module Dockerun
   class Error < StandardError; end
   # Your code goes here...
+
+  def self.udebug(msg)
+    logger.tdebug(:dockerun, msg) if is_user_debug_on?
+  end
+
+  def self.logger
+    if @_logger.nil?
+      @_logger = TeLogger::Tlogger.new
+    end
+    @_logger
+  end
+
+  def self.is_user_debug_on?
+    val = ENV["DOCKERUN_DEBUG"]
+    (not val.nil? and val == "true")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ian
@@ -14,30 +14,30 @@ dependencies:
   name: toolrack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: teLogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devops_assist
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - lib/dockerun/command/run.rb
 - lib/dockerun/command/run_new_container.rb
 - lib/dockerun/command/run_new_image.rb
+- lib/dockerun/command/stop_container.rb
 - lib/dockerun/config.rb
 - lib/dockerun/docker_command_factory_helper.rb
 - lib/dockerun/docker_container_helper.rb