dockerun 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6626fb24f14182ca40924b86c645115f4a18d14da1d48cfd9832fb85b7aebf47
-  data.tar.gz: 4a19edb06eb072198af2ee92db3a6aa7e3d086ce3057940530abd5379defcc54
+  metadata.gz: 8dcb623a392a05026de03f0ed5269e571f61301b5e987b13fffdf07158925748
+  data.tar.gz: bb83b3023ebec5b7813edb7f33b92800e1cdc6f02bc10cd38f72ea3b8b64b5c7
 SHA512:
-  metadata.gz: 3e0f07f26555f30b7fa03ae2e17f84adb3a1430db7ce1d8ad6ae228e2604f896d00744ec7c56fc90294e07d1dfc115ee9782b6035975615d7383cb7d2a831334
-  data.tar.gz: d623e2f25169ee8a137c14b8aaeac5192f71f1e836b9740d3d93956e530338de854497ae752a1ea8105b92bf1c7f500b8d22353e3ff2308d55ca6e9fc3d2a182
+  metadata.gz: c7d46fcc6424c9e50cd675f1396647f1f206997becd2d5594a71d060b58cf4d140a24ba20fec18663f9cd9f0465679ec78f42a33000af964dbbb66b7e1a8ede3
+  data.tar.gz: 3d714ad1eddba9e33793de52888b8f2389a7e2f1139ac37001aa1a010eb2f003ca73b503617adb9a017d25eccc2199e8d9c1590e5d2d6d6c83b231b7a0dd4b4f

data/.release_history.yml

@@ -28,3 +28,7 @@ dockerun:
   :timestamp: 1670640902.591357
 - :version: 0.1.13
   :timestamp: 1670649972.645625
+- :version: 0.1.14
+  :timestamp: 1670677180.3442845
+- :version: 0.1.15
+  :timestamp: 1679980468.4161575

data/Dockerfile.dockerun

@@ -1,9 +1,15 @@
 
-FROM jruby:9.4.0-jdk11
-LABEL version="0.1" description="Dockerfile generated by dockerun" maintainer="chris"
+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
+
+
 
-# 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 && \
@@ -12,8 +18,12 @@ RUN groupadd -f -g 1000  chris && \
 
 USER chris
 
-RUN sudo apt-get install -y curl git
+# from this point onwards, sudo is required for privileaged operation
+#RUN sudo apt-get install -y curl build-essential
+
+
+
+# other Dockerfile entries starts here
 
-# ENTRYPOINT [ "/bin/bash" ]
-# CMD [ "/bin/bash", "--login" ]
 CMD [ "/bin/bash", "--login" ]
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dockerun (0.1.12)
+    dockerun (0.1.15)
       docker-cli
       teLogger (~> 0.2.0)
       toolrack (~> 0.19.1)
@@ -12,7 +12,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     base58 (0.2.3)
-    devops_assist (0.3.1)
+    devops_assist (0.3.9)
       git_cli
       git_cli_prompt
       gvcs
@@ -20,22 +20,21 @@ GEM
       toolrack
       tty-prompt
     diff-lcs (1.5.0)
-    docker-cli (0.1.1)
+    docker-cli (0.2.0)
       ptools
       teLogger
-      toolrack
       tty-command
       tty-prompt
-    git_cli (0.10.0)
+    git_cli (0.11.2)
       gvcs
       ptools (~> 1.4.0)
       teLogger
       toolrack
-    git_cli_prompt (0.3.1)
+    git_cli_prompt (0.3.2)
       teLogger
       toolrack
       tty-prompt
-    gvcs (0.1.0)
+    gvcs (0.1.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
@@ -44,12 +43,12 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

data/exe/dockerun

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+require 'toolrack'
+include TR::CondUtils
+
 require 'tty/prompt'
 require_relative '../lib/dockerun'
 
@@ -16,18 +19,33 @@ else
   when "init"
     initCmd = Dockerun::Command::Init.new
     argv = ARGV[1..-1]
-    res2 = initCmd.parse(argv).run do |ops, val|
-      case ops
-      when :multiple_templates_detected
-        pmt.select("There are multiple templates available. Please select one of the template : ") do |m|
-          val.each do |v|
-            m.choice v, v
+    begin
+      res2 = initCmd.parse(argv).run do |ops, val|
+        case ops
+        when :multiple_templates_detected
+          pmt.select("There are multiple templates available. Please select one of the template : ") do |m|
+            val.each do |v|
+              m.choice v, v
+            end
+          end
+
+        when :prompt_user_configurables
+          pmt.say "\n The following are the configurable items for the template '#{val[:template]}' : \n", color: :yellow
+          res = {  }
+          val[:userFields].each do |k,v|
+            res[k] = pmt.ask("#{k.to_s.capitalize} : ") 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
           end
+          res
         end
       end
-    end
 
-    STDOUT.puts "\nDockerfile written to '#{res2}'\n\n"
+      STDOUT.puts "\nDockerfile written to '#{res2}'\n\n"
+    rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
+    end
 
   when "run", "r"
 
@@ -36,6 +54,7 @@ else
       argv = ARGV[1..-1]
       runCmd.parse(argv).run
     rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
     end
 
 
@@ -46,6 +65,7 @@ else
       argv = ARGV[1..-1]
       runCmd.parse(argv).run
     rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
     end
 
 
@@ -56,6 +76,7 @@ else
       argv = ARGV[1..-1]
       runCmd.parse(argv).run
     rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
     end
 
 
@@ -65,6 +86,7 @@ else
       argv = ARGV[1..-1]
       riCmd.parse(argv).run
     rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
     end
 
 
@@ -75,6 +97,7 @@ else
       argv = ARGV[1..-1]
       riCmd.parse(argv).run
     rescue TTY::Reader::InputInterrupt
+      pmt.say "\n\n Aborted\n", color: :yellow
     end
 
 

data/lib/dockerun/command/init.rb

@@ -1,7 +1,7 @@
 
 require 'tty/option'
 
-require_relative '../template/template_writter'
+require_relative '../template/template_writer'
 
 module Dockerun
   module Command
@@ -59,6 +59,10 @@ module Dockerun
         end
 
         tw = ::Dockerun::Template::TemplateWriter.new(selTemp)
+        userFields = tw.user_configurables
+        if block
+          tw.user_configurables = block.call(:prompt_user_configurables, { template: selTemp, userFields: userFields })
+        end
         res = tw.compile
 
         File.open(out, "w") do |f|

data/lib/dockerun/template/template_engine.rb

@@ -10,8 +10,14 @@ module Dockerun
 
       def self.available_templates
         avail = Dir.glob(File.join(template_root,"Dockerfile_*.erb"))
+
+        #userDir = File.join(Dir.home,".dockerun","template")
+        #if File.exist?(userDir)
+        #  avail += Dir.glob(userDir,"*.erb")
+        #end
+        
         avail.map! { |f| 
-          name = File.basename(f,".erb")
+          name = File.basename(f,File.extname(f))
           name.gsub("Dockerfile_","")
         }
       end

data/lib/dockerun/template/template_writer.rb

@@ -11,7 +11,8 @@ module Dockerun
 
       class TemplateNotFound < StandardError; end
 
-      attr_accessor :image, :user_group_id, :user_group_name, :user_id, :user_login
+      attr_accessor :image, :user_group_id, :user_group_name, :user_id, :user_login, :maintainer, :image_base
+      attr_writer :user_configurables
 
       def self.instance(template)
         tmp = template.to_s.downcase
@@ -32,9 +33,40 @@ module Dockerun
         @user_group_name = group[:group_name]
         @user_id = user[:user_id]
         @user_login = user[:login]
+        @image_base = :ubuntu
+      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 }
+        }
+
+        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 }
+          }
+          fields.merge!(f2)
+        end
+        fields
       end
 
       def compile(&block)
+
+        if not_empty?(@user_configurables)
+          @user_configurables.each do |k,v|
+            begin
+              self.send("#{k}=", v)
+            rescue Exception => ex
+              STDERR.puts "Setting value exception : #{ex}"
+            end
+          end
+        end
+
         tmp = find_template
         cont = nil
         File.open(tmp,"r") do |f|

data/lib/dockerun/version.rb

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

data/template/Dockerfile_general.erb

@@ -1,12 +1,32 @@
 
-FROM <%= image %>
-LABEL version="0.1" description="Dockerfile generated by dockerun" maintainer="<%= @maintainer %>"
+FROM <%= @image %>
+LABEL version="0.1"
+LABEL maintainer="<%= @maintainer %>"
+LABEL description="Dockerfile generated by dockerun" 
+LABEL dockerun-info="https://github.com/chrisliaw/dockerun"
 
-# Dockerfile entries here
+<% 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
+<% end %>
 
-RUN groupadd -f -g <%= @user_group_id %>  <%= @user_group_name %> && useradd -u <%= @user_id %> -g <%= @user_group_id %> -m <%= @user_login %>
-USER <%= @user_login %>:<%= @user_group_name %>
+<% if TR::RTUtils.on_linux? %>
+
+RUN groupadd -f -g <%= @user_group_id %>  <%= @user_group_name %> && \ 
+    useradd -u <%= @user_id %> -g <%= @user_group_id %> -m <%= @user_login %> && \
+    usermod -aG sudo <%= @user_login %> && \ 
+    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+USER <%= @user_login %>
+
+# from this point onwards, sudo is required for privileaged operation
+#RUN sudo apt-get install -y curl build-essential
+
+<% end %>
+
+# other Dockerfile entries starts here
 
-# ENTRYPOINT [ "/bin/bash" ]
-# CMD [ "/bin/bash", "--login" ]
 CMD [ "/bin/bash", "--login" ]
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -130,12 +130,9 @@ files:
 - lib/dockerun/template/jruby_template_writer.rb
 - lib/dockerun/template/template_engine.rb
 - lib/dockerun/template/template_writer.rb
-- lib/dockerun/template/template_writter.rb
-- lib/dockerun/template_engine.rb
 - lib/dockerun/user_info.rb
 - lib/dockerun/version.rb
 - template/Dockerfile_general.erb
-- template/Dockerfile_jruby-9.4.0-jdk11.erb
 homepage: ''
 licenses: []
 metadata: {}
@@ -154,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/dockerun/template/template_writter.rb

@@ -1,58 +0,0 @@
-
-require 'erb'
-
-require_relative '../user_info'
-
-module Dockerun
-  module Template
-
-    class TemplateWritter
-      include UserInfo 
-
-      class TemplateNotFound < StandardError; end
-
-      attr_accessor :image, :user_group_id, :user_group_name, :user_id, :user_login
-
-      def self.instance(template)
-        
-      end
-      
-      def initialize(template = :general)
-        @template = template
-        @image = "<Replace me>"
-        user = user_info
-        group = group_info
-        @maintainer = user[:login]
-        @user_group_id = group[:group_id]
-        @user_group_name = group[:group_name]
-        @user_id = user[:user_id]
-        @user_login = user[:login]
-      end
-
-      def compile(&block)
-        tmp = find_template
-        cont = nil
-        File.open(tmp,"r") do |f|
-          cont = f.read
-        end
-
-        b = binding
-
-        res = ERB.new(cont)
-        res.result(b)
-      end
-
-      private
-      def find_template
-        @template = :general if is_empty?(@template)
-
-        root = TemplateEngine.template_root
-        templateFile = File.join(root,"Dockerfile_#{@template}.erb")
-        raise TemplateNotFound, "Given template '#{@template}' could not be found" if not File.exist?(templateFile)
-
-        templateFile
-      end
-
-    end
-  end
-end

data/lib/dockerun/template_engine.rb

@@ -1,14 +0,0 @@
-
-
-module Dockerun
-  module Template
-    class TemplateEngine
-
-      def self.available_templates
-        path = File.join(File.dirname(__FILE__),"..","..","..","template")
-        
-      end
-
-    end
-  end
-end

data/template/Dockerfile_jruby-9.4.0-jdk11.erb

@@ -1,21 +0,0 @@
-
-FROM jruby:9.4.0-jdk11
-LABEL version="0.1" description="Dockerfile generated by dockerun" maintainer="<%= @maintainer %>"
-
-RUN apt-get update && apt-get install -y sudo 
-
-RUN groupadd -f -g <%= @user_group_id %>  <%= @user_group_name %> && \ 
-    useradd -u <%= @user_id %> -g <%= @user_group_id %> -m <%= @user_login %> && \
-    usermod -aG sudo <%= @user_login %> && \ 
-    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-USER <%= @user_login %>
-
-# from this point onwards, sudo is required for privileaged operation
-RUN sudo apt-get install -y curl
-
-# other Dockerfile entries starts here
-
-# ENTRYPOINT [ "/bin/bash" ]
-# CMD [ "/bin/bash", "--login" ]
-CMD [ "/bin/bash", "--login" ]