dockdev 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 190fb93712b6c1bae63281b42de5937866791af1a1d00f1e42b7ebee453436cb
-  data.tar.gz: 1b6bd909c27c7ab06f419c3f91846f036dd86548668ba31f0b201acda311fb3b
+  metadata.gz: 46c0990e754ea7e99a901a36fc68b2ecec7382563063546f31a65e6e0e0d3c98
+  data.tar.gz: 716529dec6307e70706aaa02ff11b2cdf1287fd766411695d6b7b3e07bab2a17
 SHA512:
-  metadata.gz: 2d63a111dc55feab9e5b562a4e8fc75667b0fbc5bc8163a4fd67ef15ad991fa0dbb7919f8614e363a29b0f3f7b9e6a9afe4d6f14bd9567d2a2d829f63a9d4fc2
-  data.tar.gz: 36de0b82ec04b79fbf94dff6b375f91eaaee5b676aa9e252a7064f77f96b2c5c81568825dd565936538e900c1d717e85bb4debccb360c2fdfc9eec999f1f4693
+  metadata.gz: 4d38a7214147deb4541da538d2b23564cb443ae3f1e4aa8e3721ea636e3712aec4072637fc59f046189619a3f1a814e3772e43195822b97d09b0dc25c653ab75
+  data.tar.gz: a73e6b416d9268ec0c38239fea64e3655c4d0a8a1eb1a6527e40c43f1329f38f11a252fba592467643041deb17b51433a47aa99854b264ac0174d6359e103246

data/exe/dockdev

@@ -7,11 +7,16 @@
 
 require_relative '../lib/dockdev'
 
-contName = ARGV.first || File.basename(Dir.getwd)
-cmd = ARGV[1]
+#contName = ARGV.first || File.basename(Dir.getwd)
+#cmd = ARGV[1]
+#input = ARGV[1]
+
+uconf = Dockdev::UserConfig.new(ARGV.first)
+contName = uconf.container_name || File.basename(Dir.getwd)
 
 begin
-  Dockdev.with_running_container(contName, command: cmd, root: Dir.getwd)
+  #Dockdev.with_running_container(contName, command: cmd, root: Dir.getwd)
+  Dockdev.with_running_container(contName, user_config: uconf, root: Dir.getwd)
 rescue StandardError => ex
   STDERR.puts ex.message
   STDERR.puts ex.backtrace.join("\n")

data/lib/dockdev/container.rb

@@ -69,5 +69,6 @@ module Dockdev
       end
     end
 
+
   end
 end

data/lib/dockdev/context/rubygems.rb

@@ -43,7 +43,7 @@ module Dockdev
               if not d.source.nil?
                 src = d.source
                 if src.path.to_s != "."
-                  pathInsideDocker = File.join(dir_inside_docker, d.name)
+                  pathInsideDocker = File.join(ddConf.workdir, d.name)
                   ddConf.add_mount(src.path.expand_path.to_s,pathInsideDocker)
                   # following line assumed 'bundle' program already installed inside the image
                   cmd << "bundle config --global local.#{d.name} #{pathInsideDocker}"

data/lib/dockdev/dockdev_config.rb

@@ -58,6 +58,7 @@ module Dockdev
 
     # for container
     attr_reader :mounts, :ports
+    attr_accessor :network
     
     # for image
     attr_reader :dockerfile_entries
@@ -69,6 +70,7 @@ module Dockdev
     def initialize(val = {})
       @mounts = val[:mounts] || {}
       @ports = val[:ports] || {}
+      @network = val[:network] || nil
       @dockerfile_entries = val[:dockerfile_entries] || []
       @workdir = val[:workdir] || "/opt"
       @skip_context = val[:skip_context] || []

data/lib/dockdev/image.rb

@@ -1,6 +1,10 @@
 
 require 'docker/cli'
 
+require 'securerandom'
+
+require_relative 'user_info'
+
 module Dockdev
   class Image
     include TR::CondUtils
@@ -20,22 +24,41 @@ module Dockdev
     end
 
     def new_container(cont_name, opts = {})
+
       optss = {
         interactive: true,
         tty: true,
-        container_name: cont_name
+        container_name: cont_name,
+        match_user: TR::RTUtils.on_linux?
       }
       optss.merge!(opts)
+
       @cmd_fact.create_container_from_image(@image_name, optss).run
+
     end
 
     def build(dockerfile, opts = {})
+
+      dockerfilePath = dockerfile
+      if is_transfer_user?(opts)
+        cont = append_transfer_user_in_dockerfile(dockerfile)
+        dockerfilePath = generated_dockerfile
+        File.open(dockerfilePath, "w") do |f|
+          f.write cont
+        end
+      end
+
       optss = {  
         context_root: opts[:root],
-        dockerfile: dockerfile
+        dockerfile: dockerfilePath
       }
       optss.merge!(opts)
-      @cmd_fact.build_image(@image_name, optss).run
+      res = @cmd_fact.build_image(@image_name, optss).run
+
+      FileUtils.rm(generated_dockerfile) if File.exist?(generated_dockerfile) and not is_keep_generated_dockerfile?
+
+      res
+
     end
 
     def destroy
@@ -47,5 +70,67 @@ module Dockdev
       end
     end
 
+
+    private
+    def logger
+      Dockdev.logger(:dockdev_image)
+    end
+
+    def is_keep_generated_dockerfile?
+      v =  ENV["DOCKDEV_KEEP_GENERATED_DOCKERFILE"]
+      is_empty?(v) ? false : (v.downcase == "true") ? true : false
+    end
+
+    def generated_dockerfile
+      "Dockerfile-dockdev"
+    end
+
+    def is_transfer_user?(opts = {})
+      if TR::RTUtils.on_linux?
+        true
+      else
+        (opts[:match_user].nil? || not_bool?(opts[:match_user])) ? false : opts[:match_user]
+      end
+    end
+
+    def append_transfer_user_in_dockerfile(file)
+      if File.exist?(file)
+        logger.debug "Append transfer user in dockerfile '#{file}'"
+        res = []
+        cont = File.read(file)
+        indx = cont =~ /CMD/
+        if indx != nil 
+
+          res << cont[0...indx] 
+          res << transfer_user_command
+          res << cont[indx..-1] 
+
+        else
+
+          res << cont
+          res << transfer_user_command
+
+        end
+
+        res.join
+
+      else
+        ""
+      end
+    end
+
+    def transfer_user_command
+
+      ui = UserInfo.user_info
+      gi = UserInfo.group_info
+
+      res = []
+      res << "RUN apt-get update && apt-get install -y sudo"
+      res << "RUN groupadd -f -g #{gi[:gid]} #{gi[:group_name]} && useradd -u #{ui[:uid]} -g #{gi[:gid]} -m #{ui[:login]} && usermod -aG sudo #{ui[:login]} && echo '#{ui[:login]} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers"
+      res << "USER #{ui[:login]}"
+      res.join("\n")
+
+    end
+
   end
 end

data/lib/dockdev/user_config.rb

@@ -0,0 +1,44 @@
+
+
+module Dockdev
+  class UserConfig
+    include TR::CondUtils
+
+    def initialize(conf)
+      @res = parse(conf)
+    end
+
+    def is_valid?
+      @valid 
+    end
+
+    def method_missing(mtd, *args, &block)
+      if has_key?(mtd)
+        @res[mtd.to_sym]
+      else
+        nil
+        #super
+      end
+    end
+
+    def has_key?(key)
+      @res.keys.include?(key.to_sym)
+    end
+
+    private
+    def parse(conf)
+      res = {}
+      if conf.is_a?(String)      
+        @valid = true
+        conf.split(";").each do |v|
+          vv = v.split("=")
+          res[vv[0].to_sym] = vv[1] if not_empty?(vv[0]) and not_empty?(vv[1])
+        end
+      else
+        @valid = false
+      end
+
+      res
+    end
+  end
+end

data/lib/dockdev/user_info.rb

@@ -0,0 +1,36 @@
+
+require 'etc'
+
+module Dockdev
+  module UserInfo
+    include TR::CondUtils
+
+    def self.user_info(login = nil)
+      login = Etc.getlogin if is_empty?(login)
+      res = { login: login }
+      begin
+        res[:uid] = Etc.getpwnam(login).uid
+      rescue Exception => ex
+        res[:uid] = nil
+      end
+      res
+    end
+
+    def self.group_info(login = nil)
+      login = Etc.getlogin if is_empty?(login)
+      res = {  }
+      begin
+        gnm = Etc.getgrnam(login)
+        res[:group_name] = gnm.name
+        res[:gid] = gnm.gid
+      rescue Exception => ex
+        p ex
+        res[:group_name] = ""
+        res[:gid] = nil
+      end
+      res
+    end
+
+  end
+end
+

data/lib/dockdev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dockdev
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/dockdev.rb

@@ -15,6 +15,8 @@ require_relative 'dockdev/container'
 
 require_relative 'dockdev/dockdev_config'
 
+require_relative 'dockdev/user_config'
+
 module Dockdev
   include TR::CondUtils
 
@@ -26,10 +28,12 @@ module Dockdev
 
     pmt = TTY::Prompt.new
     root = opts[:root]
-    cmd = opts[:command]
+    cmd = opts[:command] || ""
 
     ddConf = load_config(root)
 
+    user_config = opts[:user_config]
+
     cont = Container.new(contName)
     if cont.has_container?
       
@@ -51,6 +55,10 @@ module Dockdev
       # root directory is mounted by default
       ddConf.add_mount(root, File.join(ddConf.workdir,File.basename(root)))
 
+      if user_config.has_key?(:network)
+        ddConf.network = user_config.network
+      end
+
       ctx = Dockdev::Context::ContextManager.instance.get_context(root)
       logger.debug("Found context : #{ctx}")
 
@@ -109,6 +117,20 @@ module Dockdev
       # Proceed to create container
 
       param = { command: cmd, mounts: ddConf.mounts, ports: ddConf.ports }
+      if not_empty?(ddConf.network)
+        cmd_fact = Docker::Cli::CommandFactory.new
+        res = cmd_fact.create_network(ddConf.network).run
+        if res.success? and not res.is_out_stream_empty?
+          param[:network] = ddConf.network 
+        else
+          err = res.err_stream
+          if err =~ /already exist/
+            param[:network] = ddConf.network 
+          else
+            raise Error, "\n Failed to create network. Error was : #{res.err_stream}\n"
+          end
+        end
+      end
       img.new_container(cont.name, param)
 
       #if img.has_image?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockdev
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Chris
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,8 @@ files:
 - lib/dockdev/context/rubygems.rb
 - lib/dockdev/dockdev_config.rb
 - lib/dockdev/image.rb
+- lib/dockdev/user_config.rb
+- lib/dockdev/user_info.rb
 - lib/dockdev/version.rb
 - lib/dockdev/workspace.rb
 - sig/dockdev.rbs