dockdev 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b8b561d7174bc96e3ef99252ac1874799d1726a1d5ab86d6bc0c342069563e
-  data.tar.gz: 80e1d4dd047b75b0e6319137c654cbe03b640b6c94d6c2e497f26b5a8639eb4b
+  metadata.gz: aef435aebef51b0a8aa6535d4f75b6ea8151bd7c474e15547421cc31d7e4dfbc
+  data.tar.gz: 727d3c78e3c9ae406e4e0dda8c399cced4e86a6c79c4f899d06f626cf365f7d3
 SHA512:
-  metadata.gz: 9fd9d859400523d33ebae4faf46c06d54728f19ca6f76a3d530612259be283f564b285d2d305bd3f70c854df778e15947136d52ff654b82a206131fa15d0ed94
-  data.tar.gz: 20187c0c9ec2c2dc06d9bad36ca42016f79b86516624fe918597850fb2f11f4eceb0407418e20cf32d12bb81826e275163ad77b32fce914d5caaadee07f99a29
+  metadata.gz: 81a9a8152486d15d21db57fcaf83a95480bd948c500c28aef61bb3b1f321d5d2d39c5c1d07eb782905ff48b3e763a1db9bf284da78dcc3258d172b6e237684b7
+  data.tar.gz: 1f9a94feef8e90938743c97623671dcf37ee96153723db7e3f1964c2d0ca08ef8cfbf2bdabc78946c33f37dcbb002a1106c42c6e3b3958a60463e62826876809

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,39 @@ 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
+
+      FileUtils.rm(generated_dockerfile) if File.exist?(generated_dockerfile) and not is_keep_generated_dockerfile?
+
     end
 
     def destroy
@@ -47,5 +68,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_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.3.6"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockdev
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Chris
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-31 00:00:00.000000000 Z
+date: 2024-01-17 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
@@ -129,13 +129,14 @@ files:
 - lib/dockdev/context/docker-compose.rb
 - lib/dockdev/context/rubygems.rb
 - lib/dockdev/image.rb
+- lib/dockdev/user_info.rb
 - lib/dockdev/version.rb
 - lib/dockdev/workspace.rb
 - sig/dockdev.rbs
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.5.3
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []