dockerun 0.1.18 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cbcf4c70d28a02673f788a731f9a7317a5ffc0c538afb361a8390174b015efe
-  data.tar.gz: d0771b907dda8d1e2a1158829684b15c5bcdb5a4c08332ec24a7111dbabc0c14
+  metadata.gz: 7ead5589eb4e3bb3a0fecefc1cccc9205efc2e20a72077c78916ad4b3baf3630
+  data.tar.gz: aae134574147ba68372ac437b91d72f4d0588fde4d9cd9018a4958148677b00c
 SHA512:
-  metadata.gz: 4f506a0572240746fbfcc3d2946454f534b54c6ab922f21f6cc2c004421a16a60b0adf0b11e38efef22b1f58adf69ea5509de8c0fe7ecb037ccbf6ec48ae5aab
-  data.tar.gz: 93cac69a37122f6aff3baa234a617036d29b590fe0bc81b8dcf18767c71f35a55eebbf09f8ce0ef6a2e09eadd469d1132dc11bc2b0b8224aca1f45f18ec13ae5
+  metadata.gz: a8f1b851ea681c872cd7942896857473e30ea3df971e551afb884380882919f5b374327dc6b358565040baae82f2f8eb185bc2ce34ad1618aa139439febb78d4
+  data.tar.gz: 6932af98445ab8e388be8a0f7a0479cc15b88cf23196f5a3080822d5490899f8966bab4751b114b673d43d6767c8c9c18dace517616c89892dc7c6e0582c7012

data/.release_history.yml

@@ -36,3 +36,7 @@ dockerun:
   :timestamp: 1680096788.8148112
 - :version: 0.1.17
   :timestamp: 1680413747.3876462
+- :version: 0.1.18
+  :timestamp: 1680413850.243007
+- :version: 0.2.0
+  :timestamp: 1680589830.9123309

data/Dockerfile.dockerun

@@ -6,7 +6,7 @@ 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
+RUN apt-get update && apt-get install -y sudo git curl build-essential vim
 
 
 
@@ -22,6 +22,16 @@ USER chris
 #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
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,8 +1,21 @@
+GIT
+  remote: docker-cli
+  revision: a3fc5811299f71c2b0847bec10d3582f965b72b5
+  branch: master
+  specs:
+    docker-cli (0.1.2)
+      ptools
+      teLogger
+      toolrack
+      tty-command
+      tty-prompt
+
 PATH
   remote: .
   specs:
-    dockerun (0.1.18)
-      docker-cli
+    dockerun (0.2.1)
+      colorize
+      docker-cli (>= 0.1.2)
       teLogger (> 0.2.0)
       toolrack (> 0.19.1)
       tty-command
@@ -11,6 +24,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    colorize (0.8.1)
     devops_assist (0.3.11)
       git_cli
       git_cli_prompt (~> 0.3.3)
@@ -19,11 +33,6 @@ GEM
       toolrack
       tty-prompt
     diff-lcs (1.5.0)
-    docker-cli (0.2.0)
-      ptools
-      teLogger
-      tty-command
-      tty-prompt
     git_cli (0.11.2)
       gvcs
       ptools (~> 1.4.0)
@@ -69,10 +78,12 @@ GEM
     wisper (2.0.1)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   devops_assist
+  docker-cli!
   dockerun!
   rake (~> 13.0)
   rspec (~> 3.0)

data/dockerun.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
 
   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'
+  spec.add_dependency 'docker-cli', ">= 0.1.2"
 
   spec.add_development_dependency 'devops_assist'
 

data/exe/dockerun

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'bundler/setup'
 require 'toolrack'
 include TR::CondUtils
 

data/lib/dockerun/bundler_helper.rb

@@ -0,0 +1,25 @@
+
+require 'bundler'
+
+module Dockerun
+  module CommandHelper
+    module BundlerHelper
+
+      def find_local_dev_gems
+
+        res = {}
+        Bundler.load.dependencies.each do |d|
+          if not d.source.nil?
+            src = d.source
+            if src.path.to_s != "."
+              res[d.name] = src.path.to_s
+            end
+          end
+        end
+        res
+
+      end # find_local_dev_gem
+      
+    end
+  end
+end

data/lib/dockerun/command/remove_container.rb

@@ -42,7 +42,7 @@ module Dockerun
                 m.choice n,n
               end
             end
-          end
+          end # find imageName
 
           if is_empty?(config.container_names(imageName))
             STDOUT.puts "There is no container registered under image '#{imageName}'"

data/lib/dockerun/command/run.rb

@@ -62,14 +62,88 @@ module Dockerun
           end
 
 
-          imageName = build_image_if_not_exist(imageName) do |ops, val|
+          imageName, mount_points = build_image_if_not_exist(imageName) do |ops, *val|
             case ops
             when :new_image_name
-              cli.ask("Please provide a new image name : ", required: true)
+              cli.ask("Please provide a new image name : ".yellow, required: true)
+
             when :image_exist
-              reuse = cli.yes? "Image '#{val}' already exist. Using existing image?"
+              reuse = cli.yes? "Image '#{val.first}' already exist. Using existing image?"
               # proceed or not , new name
-              [reuse, val]
+              [reuse, val.first]
+
+            when :prompt_mount_points_starting
+              cli.say "\n Mount Directory into Docker : \n", color: :yellow
+
+            when :transfer_dev_gem_mapping?
+              found = val.first
+              cli.say(" It seems that the project has development gem attached to it : \n Found development gems (#{found.length}) : \n", color: :yellow)
+              if not found.nil? 
+                found.each do |name, path|
+                  cli.say("  * #{name} [#{path}]\n", color: :yellow)
+                end
+              end
+              cli.yes?(" Do you want to map the above development gems inside the docker? : ".yellow)
+
+            when :workspace_root_inside_docker
+              cli.ask("\n Workspace '#{val[2]}' shall be mapped to which directory inside the docker? : ".yellow, required: true, value: File.join(val.first, val[1]))
+
+            when :map_project_dir
+              res = cli.ask("\n Please provide path inside docker for current directory [Empty to skip mounting current directory] : ".yellow, value: File.join(val.first, File.basename(Dir.getwd)) )
+              if is_empty?(res)
+                cli.puts "\n Current directory '#{Dir.getwd}' shall not be available inside the docker".red
+              end
+              res
+
+            when :volume_mapping_required?
+              cli.yes?("\n Is there any other volume mapping required? ".yellow)
+
+            when :source_prompt
+              param = val.first
+              msg = []
+              if not param.nil?
+                msg = param[:control] 
+              end
+              cli.ask("\n Directory to share with docker [#{msg.join(", ")}] : ".yellow, required: true)
+
+            when :destination_prompt
+              src = val.first
+              srcDir = File.basename(src)
+              cli.ask("\n Directory inside docker : ".yellow, required: true, value: "/opt/#{srcDir}")
+
+            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)
+
+            when :prompt_user_configurables
+              vv = val.first
+              cli.say "\n The following are the configurable items for the template '#{vv[:template]}' : \n".yellow
+              res = {  }
+              vv[:userFields].each do |k,v|
+                case v[:type]
+                when :ask
+                  res[k] = cli.ask(v[:desc].yellow) do |s|
+                    s.required v[:required]  if not_empty?(v[:required]) and is_bool?(v[:required])
+                    s.value v[:default].to_s if not_empty?(v[:default])
+                  end
+
+                when :select
+                  res[k] = cli.select(v[:desc].yellow) do |m|
+                    v[:options].each do |opt, key|
+                      m.choice opt, key
+                    end
+                    #m.default v[:default] if not_empty?(v[:default])
+                  end
+                end
+              end
+
+              res
+
             else
 
             end
@@ -101,24 +175,38 @@ module Dockerun
             end
           end
 
-          selContName = run_docker_container(imageName, selContName) do |ops, *args|
+          selContName = run_docker_container(imageName, selContName, mount_points) do |ops, *args|
             case ops
             when :new_container_name
-              cli.ask("Please provide a new container name : ", required: true)
+              cli.ask("\n Please provide a new container name : ".yellow, required: true)
             when :container_name_exist
-              cli.yes?("Container name '#{args.first}' already exist. Proceed with existing?")
-            when :volume_mapping_required?
-              cli.yes?("Is there any volume mapping required? ")
-            when :source_prompt
-              cli.ask("Directory to share with docker : ", required: true)
-            when :destination_prompt
-              src = args.first
-              srcDir = File.basename(src)
-              cli.ask("Directory to show inside docker : ", required: true, value: "/opt/#{srcDir}")
-            when :add_mount_to_container
-              config.add_mount_to_container(imageName, *args)
-            when :add_more_volume_mapping?
-              cli.yes?("Add more volume mapping?")
+              cli.yes?(" ** Container name '#{args.first}' already exist. Proceed with existing?".red)
+
+            #when :transfer_dev_gem_mapping?
+            #  cli.yes?("It seems that the project has development gem attached to it. Do you want to map those development gems too inside the docker? ")
+
+            #when :workspace_root_inside_docker
+            #  cli.ask(" Workspace '#{args[2]}' shall be mapped to which directory inside the docker? ", required: true, value: File.join(args.first, args[1]))
+
+            #when :map_project_dir
+            #  cli.ask(" Please provide path inside docker for current directory [Empty to skip mounting current directory] : ", value: File.join(args.first, File.basename(Dir.getwd)), required: true)
+
+            #when :volume_mapping_required?
+            #  cli.yes?("Is there any volume mapping required? ")
+            #when :source_prompt
+            #  cli.ask("Directory to share with docker : ", required: true)
+            #when :destination_prompt
+            #  src = args.first
+            #  srcDir = File.basename(src)
+            #  cli.ask("Directory to show inside docker : ", required: true, value: "/opt/#{srcDir}")
+
+            #when :add_to_bundle?
+            #  cli.yes?(" Add directory '#{args.first}' to bundler config local? ")
+
+            #when :add_mount_to_container
+            #  config.add_mount_to_container(imageName, *args)
+            #when :add_more_volume_mapping?
+            #  cli.yes?("Add more volume mapping?")
             end
           end
 

data/lib/dockerun/command/run_new_image.rb

@@ -38,7 +38,7 @@ module Dockerun
           # find history file
           config = ::Dockerun::Config.from_storage
 
-          imageName = build_image_if_not_exist(imageName) do |ops, val|
+          imageName, mount_points = build_image_if_not_exist(imageName) do |ops, val|
             case ops
             when :new_image_name
               cli.ask("Please provide a new image name : ", required: true)

data/lib/dockerun/docker_container_helper.rb

@@ -1,15 +1,17 @@
 
 require_relative 'docker_command_factory_helper'
+require_relative 'bundler_helper'
 
 module Dockerun
   module CommandHelper
     module DockerContainerHelper
       include DockerCommandFactoryHelper
+      include BundlerHelper
 
       class DockerContainerBuildFailed < StandardError; end
       class DockerContainerStartFailed < StandardError; end
 
-      def run_docker_container(image_name, container_name, &block)
+      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)
@@ -39,7 +41,10 @@ module Dockerun
         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?
             # not running
@@ -56,24 +61,81 @@ module Dockerun
 
         else
 
-          reqVolMap = block.call(:volume_mapping_required?)
-          mount = []
-          if reqVolMap
+          #@workspace_root = "/opt"
+          #@shared_dirs = {}
 
-            loop do
+          #mount = []
+          #sharedInsideDocker = []
+          #res = find_local_dev_gems
+          #puts "Found #{res.length} local gems #{res}"
+          #if not res.empty?
+          #  
+          #  transferMapping = block.call(:transfer_dev_gem_mapping?)
+          #  if transferMapping
+          #    res.each do |name, path|
+          #      tsrc = block.call(:workspace_root_inside_docker, @workspace_root, name, path)
+          #      inPath = File.join(tsrc, name)
+          #      mount << { path => inPath }
+          #      @shared_dirs[name] = inPath 
+          #    end
+          #  end
 
-              src = block.call(:source_prompt)
-              dest = block.call(:destination_prompt, src)
-              mount << { src => dest }
-              block.call(:add_mount_to_container, container_name, mount.last)
-              repeat = block.call(:add_more_volume_mapping?)
-              break if not repeat
+          #end
+
+          #mapProjectDir = block.call(:map_project_dir, @workspace_root)
+          #if not_empty?(mapProjectDir)
+          #  mount << { Dir.getwd => mapProjectDir }
+          #end
+
+          #reqVolMap = block.call(:volume_mapping_required?)
+          #if reqVolMap
+
+          #  loop do
+          #    
+          #    block.call(:already_mapped, mount)
+
+          #    src = block.call(:source_prompt)
+          #    dest = block.call(:destination_prompt, src)
+          #    mount << { src => dest }
+          #    
+          #    add_to_bundle = block.call(:add_to_bundle?, dest)
+          #    if add_to_bundle
+          #      @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
+
+          #  end
+
+          #end
+
+
+          #insideDockerConfig = File.join(File.dirname(__FILE__),"..","..","template","setup_ruby_devenv.rb.erb")
+          #if File.exist?(insideDockerConfig)
+          #  
+          #  @docker_init_file_path = File.join(Dir.getwd,"on_docker_config")
+
+          #  cont = File.read(insideDockerConfig)
+          #  
+          #  b = binding
+
+          #  res = ERB.new(cont)
+          #  out = res.result(b)
+
+          #  # fixed this name to be used inside Dockerfile 
+          #  File.open(@docker_init_file_path, "w") do |f|
+          #    f.write out
+          #  end
+
+          #  block.call(:on_docker_init_file_path,@docker_init_file_path) 
+
+          #end
 
-            end
 
-          end
 
-          dcFact.create_container_from_image(image_name, interactive: true, tty: true, container_name: container_name, mount: mount).run
+          dcFact.create_container_from_image(image_name, interactive: true, tty: true, container_name: container_name, mount: mount_points).run
 
         end
 
@@ -84,9 +146,10 @@ module Dockerun
       private
       def is_container_exist?(name)
         if not_empty?(name)
-          res = dcFact.find_from_all_container(name).run
+          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, ""]

data/lib/dockerun/docker_image_helper.rb

@@ -1,20 +1,27 @@
 
 require_relative 'cli_prompt'
 require_relative 'docker_command_factory_helper'
+require_relative 'bundler_helper'
+require_relative 'template/template_writer'
 
 module Dockerun
   module CommandHelper
     module DockerImageHelper
       include CliHelper::CliPrompt
       include DockerCommandFactoryHelper
+      include BundlerHelper
 
       class DockerfileNotExist < StandardError; end
       class DockerImageBuildFailed < StandardError; end
       class DockerImageDeleteFailed < StandardError; end
+      class DockerImagePrebuiltConfigFailed < StandardError; end
 
-      def load_dockerfile(root = Dir.getwd)
+      def load_dockerfile(root = Dir.getwd, dockerInitPath = nil, &block)
 
-        df = Dir.glob(File.join(root,"Dockerfile*"))
+        #avail = ::Dockerun::Template::TemplateEngine.available_templates
+        df = ::Dockerun::Template::TemplateEngine.available_templates
+
+        #df = Dir.glob(File.join(root,"Dockerfile*"))
         if df.length == 0
           raise DockerfileNotExist, "Dockerfile not yet available. Please create one or run init first."
         end
@@ -30,7 +37,32 @@ module Dockerun
           selectedDf = df.first
         end
 
-        selectedDf
+        tw = ::Dockerun::Template::TemplateWriter.new(selectedDf)
+        tw.docker_init_file_path = dockerInitPath
+        userFields = tw.user_configurables
+        if block
+          tw.user_configurables = block.call(:prompt_user_configurables, { template: selectedDf, userFields: userFields })
+        end
+        res = tw.compile
+
+        loc = "."
+        #loc = params[:location] if not_empty?(params[:location])
+
+        loc = File.expand_path(loc)
+        out = nil
+        if File.directory?(loc)
+          out = File.join(loc, "Dockerfile.dockerun")
+        else
+          out = File.join(File.dirname(loc), "Dockerfile.dockerun")
+        end
+
+        File.open(out, "w") do |f|
+          f.write res
+        end
+
+
+        #selectedDf
+        File.basename(out)
           
       end
 
@@ -38,6 +70,7 @@ module Dockerun
        
         raise DockerImageBuildFailed, "block is required" if not block
 
+        mountPoints = []
         if is_empty?(name)
           reuse = false
           loop do
@@ -50,20 +83,184 @@ module Dockerun
           if reuse
             
           else
-            dockerfile = load_dockerfile(Dir.getwd)
+
+            #@workspace_root = "/opt"
+            #@shared_dirs = {}
+
+            #mount = []
+            #sharedInsideDocker = []
+            #res = find_local_dev_gems
+            #puts "Found #{res.length} local gems #{res}"
+            #if not res.empty?
+
+            #  transferMapping = block.call(:transfer_dev_gem_mapping?)
+            #  if transferMapping
+            #    res.each do |name, path|
+            #      tsrc = block.call(:workspace_root_inside_docker, @workspace_root, name, path)
+            #      inPath = File.join(tsrc, name)
+            #      mount << { path => inPath }
+            #      @shared_dirs[name] = inPath 
+            #    end
+            #  end
+
+            #end
+
+            #mapProjectDir = block.call(:map_project_dir, @workspace_root)
+            #if not_empty?(mapProjectDir)
+            #  mount << { Dir.getwd => mapProjectDir }
+            #end
+
+            #reqVolMap = block.call(:volume_mapping_required?)
+            #if reqVolMap
+
+            #  loop do
+
+            #    block.call(:already_mapped, mount)
+
+            #    src = block.call(:source_prompt)
+            #    dest = block.call(:destination_prompt, src)
+            #    mount << { src => dest }
+
+            #    add_to_bundle = block.call(:add_to_bundle?, dest)
+            #    if add_to_bundle
+            #      @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
+
+            #  end
+
+            #end
+
+
+            #insideDockerConfig = File.join(File.dirname(__FILE__),"..","..","template","setup_ruby_devenv.rb.erb")
+            #if File.exist?(insideDockerConfig)
+
+            #  @docker_init_file_path = File.join(Dir.getwd,"on_docker_config")
+
+            #  cont = File.read(insideDockerConfig)
+
+            #  b = binding
+
+            #  res = ERB.new(cont)
+            #  out = res.result(b)
+
+            #  # fixed this name to be used inside Dockerfile 
+            #  File.open(@docker_init_file_path, "w") do |f|
+            #    f.write out
+            #  end
+
+            #  block.call(:on_docker_init_file_path,@docker_init_file_path) 
+
+            #end
+
+            mountPoints, dockerinit = prompt_mount_points(&block)
+
+
+            dockerfile = load_dockerfile(Dir.getwd, dockerinit, &block)
             build_docker_image(name, dockerfile: dockerfile)
           end
 
         else
 
             if not is_image_existed?(name)
-              dockerfile = load_dockerfile(Dir.getwd)
+
+              mountPoints, dockerinit = prompt_mount_points(&block)
+
+              dockerfile = load_dockerfile(Dir.getwd, dockerinit, &block)
               build_docker_image(name, dockerfile: dockerfile)
             end
 
         end
 
-        name
+        [name, mountPoints]
+
+      end
+
+      def prompt_mount_points(&block)
+
+        raise DockerImagePrebuiltConfigFailed, "block is mandatory" if not block
+
+        @workspace_root = "/opt"
+        @shared_dirs = {}
+
+        block.call(:prompt_mount_points_starting)
+
+        mount = []
+        res = find_local_dev_gems
+        #puts "Found #{res.length} local gems #{res}"
+        if not res.empty?
+
+          transferMapping = block.call(:transfer_dev_gem_mapping?, res)
+          if transferMapping
+            res.each do |name, path|
+              tsrc = block.call(:workspace_root_inside_docker, @workspace_root, name, path)
+              mount << { path => tsrc }
+              @shared_dirs[name] = tsrc 
+            end
+          end
+
+        end
+
+        mapProjectDir = block.call(:map_project_dir, @workspace_root)
+        if not_empty?(mapProjectDir)
+          mount << { Dir.getwd => mapProjectDir }
+        end
+
+        reqVolMap = block.call(:volume_mapping_required?)
+        if reqVolMap
+
+          loop do
+
+            block.call(:already_mapped, mount)
+
+            src = block.call(:source_prompt, { control: [ "Type 's' to skip" ] })
+            if src == "s"
+              block.call(:volume_mapping_skipped)
+              break
+            end
+
+            dest = block.call(:destination_prompt, src)
+            mount << { src => dest }
+
+            add_to_bundle = block.call(:add_to_bundle?, dest)
+            if add_to_bundle
+              @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
+
+          end
+
+        end
+
+
+        insideDockerConfig = File.join(File.dirname(__FILE__),"..","..","template","setup_ruby_devenv.rb.erb")
+        if File.exist?(insideDockerConfig)
+
+          @docker_init_file_path = File.join(Dir.getwd,"on_docker_config")
+
+          cont = File.read(insideDockerConfig)
+
+          b = binding
+
+          res = ERB.new(cont)
+          out = res.result(b)
+
+          # fixed this name to be used inside Dockerfile 
+          File.open(@docker_init_file_path, "w") do |f|
+            f.write out
+          end
+
+          block.call(:on_docker_init_file_path,@docker_init_file_path) 
+
+        end
+
+        [mount, @docker_init_file_path]
 
       end
 

data/lib/dockerun/template/template_writer.rb

@@ -13,6 +13,8 @@ module Dockerun
 
       attr_accessor :image, :user_group_id, :user_group_name, :user_id, :user_login, :maintainer, :image_base
       attr_writer :user_configurables
+      attr_accessor :docker_init_file_path
+      attr_accessor :match_user, :working_dir
 
       def self.instance(template)
         tmp = template.to_s.downcase
@@ -34,21 +36,26 @@ module Dockerun
         @user_id = user[:user_id]
         @user_login = user[:login]
         @image_base = :ubuntu
+        @match_user = TR::RTUtils.on_linux?
+        @working_dir = "/opt"
       end
 
       def user_configurables
         fields = {
-          image: { desc: "Image name of the docker based on", required: true },
-          image_base: { desc: "Image is based on which OS? Assumption with be on Debian based. ", default: :ubuntu },
-          maintainer: { desc: "Maintainer of the Dockerfile", default: @maintainer }
+          image: { desc: " Docker image name : ", required: true, type: :ask },
+          image_base: { desc: " Docker image OS : ", default: :debian, type: :select, options: { debian: "Ubuntu/Debian based", not_sure: "Not sure which distro" }.invert },
+          working_dir:  { desc: " Default directory after login : ", type: :ask, default: @working_dir }
         }
 
         if TR::RTUtils.on_linux?
           f2 = {
-            user_group_id: { desc: "User group ID that shall be created in docker. Default to current running user's ID", default: @user_group_id.to_s },
-            user_group_name: { desc: "User group name that shall be created in docker. Default to current running user's group", default: @user_group_name },
-            user_id: { desc: "User ID that shall be created in docker. Default to current running user ID", default: @user_id.to_s },
-            user_login: { desc: "User login name that shall be created in docker. Default to current running user's login", default: @user_login }
+            match_user: { desc: " Match host user with docker user? ", type: :yes? },
+            #maintainer: { desc: "Maintainer of the Dockerfile", default: @maintainer }
+
+            #user_group_id: { desc: "User group ID that shall be created in docker. Default to current running user's ID", default: @user_group_id.to_s },
+            #user_group_name: { desc: "User group name that shall be created in docker. Default to current running user's group", default: @user_group_name },
+            #user_id: { desc: "User ID that shall be created in docker. Default to current running user ID", default: @user_id.to_s },
+            #user_login: { desc: "User login name that shall be created in docker. Default to current running user's login", default: @user_login }
           }
           fields.merge!(f2)
         end

data/lib/dockerun/version.rb

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

data/lib/dockerun.rb

@@ -3,6 +3,9 @@
 require 'toolrack'
 require 'teLogger'
 
+require 'tty/prompt'
+require 'colorize'
+
 require_relative "dockerun/version"
 
 require_relative 'dockerun/command/dockerun'

data/template/Dockerfile_general.erb

@@ -8,11 +8,11 @@ LABEL dockerun-info="https://github.com/chrisliaw/dockerun"
 <% case @image_base.to_sym
 when :fedora %>
 RUN dnf update && dnf install sudo git curl 
-<% else %>
-RUN apt-get update && apt-get install -y sudo git curl build-essential
+<% when :debian %>
+RUN apt-get update && apt-get install -y sudo git curl build-essential vim
 <% end %>
 
-<% if TR::RTUtils.on_linux? %>
+<% if TR::RTUtils.on_linux? and @match_user == true %>
 
 RUN groupadd -f -g <%= @user_group_id %>  <%= @user_group_name %> && \ 
     useradd -u <%= @user_id %> -g <%= @user_group_id %> -m <%= @user_login %> && \
@@ -24,6 +24,16 @@ USER <%= @user_login %>
 # from this point onwards, sudo is required for privileaged operation
 #RUN sudo apt-get install -y curl build-essential
 
+<% if not (@docker_init_file_path.nil? or @docker_init_file_path.empty?) %>
+COPY <%= File.basename(@docker_init_file_path) %> /home/<%= @user_login %>/docker_init.rb 
+#RUN chown <%= @user_login %>:<%= @user_group_name %> /home/<%= @user_login %>/docker_init.rb
+RUN ruby /home/<%= @user_login %>/docker_init.rb
+<% end %>
+
+<% end %>
+
+<% if not_empty?(@working_dir) %>
+WORKDIR <%= @working_dir %>
 <% end %>
 
 # other Dockerfile entries starts here

data/template/setup_ruby_devenv.rb.erb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+## This file is auto-generated. Changes on this file will be overwritten by newly generate file on next run
+
+# setup env
+WS_ROOT = "<%= @ws_root.nil? ? "/opt" : @ws_root %>"
+
+<% if not (@shared_dirs.nil? or @shared_dirs.empty?) %>
+<% @shared_dirs.each do |name, pa| %>
+`bundle config --global local.<%= name %> <%= pa %>`
+<% end %>
+<% end %>
+
+bashrc = File.join(Dir.home,".bashrc")
+if File.exist?(bashrc)
+  cont = File.read(bashrc) 
+  if not cont =~ /^alias be/
+    `echo "alias be=\\"bundle exec\\"" >> #{bashrc}`
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.2.1
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: docker-cli
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: devops_assist
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,7 @@ files:
 - dockerun.gemspec
 - exe/dockerun
 - lib/dockerun.rb
+- lib/dockerun/bundler_helper.rb
 - lib/dockerun/cli_prompt.rb
 - lib/dockerun/command/dockerun.rb
 - lib/dockerun/command/init.rb
@@ -133,6 +148,7 @@ files:
 - lib/dockerun/user_info.rb
 - lib/dockerun/version.rb
 - template/Dockerfile_general.erb
+- template/setup_ruby_devenv.rb.erb
 homepage: ''
 licenses: []
 metadata: {}