dockdev 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd58441c3c23468da88cb8dda2167fd2a621c2101683b8f73188f1c577a339bf
-  data.tar.gz: df62a7f794e385be419c7a0268195bc299e01969e24332642b3e99c0065309cc
+  metadata.gz: f10f5e3e749c0edc610864688598f8f02f658bdf46eb9206ef3df56401afda6b
+  data.tar.gz: 962af3ef6fab3e4d0f804ce7fb20a99da4729288d8649e93fe6eba24ffe21b8f
 SHA512:
-  metadata.gz: fddea10a05a055038ad5f017bda47658d0a935cf446276bd89d410cd8971e09fe0edd3a36eb288a151876aa784a0b81da597e72d9d29eb037a427fe005e5778a
-  data.tar.gz: cd8266f7605440f2c11aa8d789161a1720b92263367cbbcefdb42196e7e14addb3d8a82dcd6b1f1f72af83a091e75f8eb01ec0a6bca640847f03e153be6f4df8
+  metadata.gz: a181e0af91cbb7323ba47e7615fd0c521d89330d440baa0e0a0ecb36b995177e31ab1bf91137e049bea367012f0b6377043f05f860dba210daee7eeeabbae24e
+  data.tar.gz: 1d5c2dc52c6e91735e076c3f2221838b0bc0e9060e0f292548ec20d3e4ff15f4db77eb40ea747cc71bfcf195b811fb756cac163db39c6b9066e6e646e659f89a

data/lib/dockdev/context/docker-compose.rb

@@ -0,0 +1,111 @@
+
+require 'yaml'
+
+require 'tty/prompt'
+
+module Dockdev
+  module Context
+    class DockerCompose
+      
+      def self.init_path(path)
+        DockerCompose.new(path)
+      end
+
+      def initialize(path)
+        @path = path
+        @parsed = false
+        @mounts = {}
+        @ports = {}
+        @pmt = TTY::Prompt.new
+      end
+
+      def is_context?
+        not find_docker_compose.empty?
+      end
+
+      def find_docker_compose
+        Dir.glob(File.join(@path,"docker-compose.*")).grep(/\.(yml|yaml)$/)
+      end
+
+      def parse_docker_compose
+        if not @parsed 
+          fdc = find_docker_compose
+
+          begin
+            if not fdc.empty?
+              load_dc = @pmt.yes?("\n docker-compose file found. Load config? ".magenta)  
+
+              if not load_dc
+                @parsed = true
+                return [@mounts, @ports]
+              end
+            end
+
+            if fdc.length > 1
+              @selected = @pmt.multi_select(" Please select docker-compose file(s) to parse for running config : ".magenta) do |mn|
+                fdc.each do |f|
+                  mn.choice File.basename(f), f
+                end
+              end
+            else
+              @selected = fdc
+            end
+
+          rescue TTY::Reader::InputInterrupt
+            # Ctrl-C is pressed... exit
+            exit(-1)
+          end
+
+          @selected.each do |dcf|
+            logger.debug " Processing docker-compose : #{dcf}"
+            dcc = YAML.load(File.read(dcf))
+            dcc.each do |k,v|
+              next if k == "version"
+              v.each do |kk,vv|
+                vv.each do |kkk, vvv|
+                  if kkk == "volumes"
+                    vvv.each do |vs|
+                      logger.debug "Extracting mount point from #{dcf} : #{vs}"
+                      vvs = vs.split(":")
+                      @mounts[File.expand_path(vvs[0])] = vvs[1]
+                    end
+                  elsif kkk == "ports"
+                    vvv.each do |vs|
+                      logger.debug "Extracting ports from #{dcf} : #{vs}"
+                      ps = vs.split(":")
+                      @ports[ps[0]] = ps[1]
+                    end
+                  end
+                end
+              end
+            end
+ 
+          end
+
+          @parsed = true
+        end
+
+        [@mounts, @ports]
+      end
+
+      def process_mount(opts = {}, &block)
+        mounts, _ = parse_docker_compose
+        mounts
+      end
+
+      def process_port(opts = {}, &block)
+        _, ports = parse_docker_compose
+        ports
+      end
+
+      private
+      def logger
+        Dockdev.logger(:ctx_docker_compose)
+      end
+
+    end
+  end
+end
+
+Dockdev::Context::ContextManager.instance.register(:docker_compose, Dockdev::Context::DockerCompose)
+

data/lib/dockdev/context/rubygems.rb

@@ -11,6 +11,8 @@ module Dockdev
 
       def initialize(path)
         @path = path
+        @mounts = {}
+        @ports = {}
       end
 
       def is_context?
@@ -21,9 +23,11 @@ module Dockdev
         Dir.glob(File.join(@path,"Gemfile"))
       end
 
-      def process_mount(mount_hash, dir_inside_docker = "/opt")
+      def process_mount(opts = { dir_inside_docker: "/opt" })
 
-        if not mount_hash.nil? and mount_hash.is_a?(Hash)
+        if @mounts.empty?
+
+          dir_inside_docker = opts[:dir_inside_docker]
 
           script = ["#!/bin/bash"]
           #script << "alias be > /dev/null 2>&1 && echo 'alias be=bundle exec' >> ~/.bashrc"
@@ -40,7 +44,7 @@ module Dockdev
               src = d.source
               if src.path.to_s != "."
                 pathInsideDocker = File.join(dir_inside_docker, d.name)
-                mount_hash[src.path.expand_path.to_s] = pathInsideDocker
+                @mounts[src.path.expand_path.to_s] = pathInsideDocker
                 script << "bundle config --global local.#{d.name} #{pathInsideDocker}"
                 #res[d.name] = src.path.expand_path.to_s
               end
@@ -55,7 +59,12 @@ module Dockdev
 
         end
 
-        mount_hash
+        @mounts
+
+      end
+
+      def process_port(opts = {})
+        @ports
       end
 
     end

data/lib/dockdev/context.rb

@@ -15,12 +15,11 @@ module Dockdev
       end
 
       def get_context(path)
-        ctx = nil
+        ctx = []
         @ctx.values.each do |v|
           vv = v.init_path(path)
           if vv.is_context?
-            ctx = vv
-            break
+            ctx << vv
           end
         end
         ctx

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.5"
+  VERSION = "0.3.7"
 end

data/lib/dockdev.rb

@@ -38,22 +38,46 @@ module Dockdev
       wss = Workspace.new(ws)
       if img.has_image?
         mount = { root => File.join("/opt",File.basename(root)) }
-        if not ctx.nil?
-          mount = ctx.process_mount(mount)
-          logger.debug "Mount points by context : #{mount}"
+        port = {}
+        ctx.each do |cctx|
+          mnts = cctx.process_mount(dir_inside_docker: "/opt")
+          logger.debug "Mount points by context : #{mnts}"
+
+          mount.merge!(mnts) if not mnts.empty?
+
+          prt = cctx.process_port
+          port.merge!(prt) if not prt.empty?
+
+          logger.debug "Ports by context #{cctx} : #{prt}"
         end
 
-        img.new_container(cont.name, command: cmd, mounts: mount)
+        param = { command: cmd, mounts: mount }
+        param[:ports] = port if not port.empty? 
+
+        img.new_container(cont.name, param)
+
       elsif wss.has_dockerfile?
         img.build(wss.dockerfile)
         
         mount = { root => File.join("/opt",File.basename(root)) }
-        if not ctx.nil?
-          mount = ctx.process_mount(mount)
-          logger.debug "Mount points by context : #{mount}"
+        port = {}
+        ctx.each do |cctx|
+          mnt = cctx.process_mount(dir_inside_docker: "/opt")
+          mount.merge!(mnt) if not mnt.empty?
+
+          logger.debug "Mount points by context #{cctx} : #{mnt}"
+
+          prt = cctx.process_port
+          port.merge!(prt) if not prt.empty?
+
+          logger.debug "Ports by context #{cctx} : #{prt}"
         end
 
-        img.new_container(cont.name, command: cmd, mounts: mount)
+        param = { command: cmd, mounts: mount }
+        param[:ports] = port if not port.empty? 
+
+        img.new_container(cont.name, param)
+
       else
         raise Error, "\n No image and no Dockerfile found to build the image found. Operation aborted. \n\n".red
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockdev
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Chris
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: release-gem
   requirement: !ruby/object:Gem::Requirement
@@ -112,15 +126,17 @@ files:
 - lib/dockdev.rb
 - lib/dockdev/container.rb
 - lib/dockdev/context.rb
+- 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
@@ -135,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: []