indocker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db1ee43dc77d64ef756d9344d1a90086034cdb3aea3aabb81e215e2142b5e11
-  data.tar.gz: af8d6b04b0a728341fab4059abbec6a89edcab45933e03cab43df6a5baa4d9f6
+  metadata.gz: a2f776697e00b04e80d3c11c4f39b17a6d107d69607c05c17e4f425c72de194a
+  data.tar.gz: 370541638e5e70251caec9ee1246d8e0dcbecc46085a9dbc2e5500916020ff6f
 SHA512:
-  metadata.gz: 5b62b0cfa0f4297e739bd3100e77d959f0cba6a3dc2687bef9b37c6cad50a5e07916b96ab91aa906e22499fd3430ab965b354f4152d5b5c8fe0929dbcb8ca493
-  data.tar.gz: da4caa93850b2279328e436986693928741f4ba8d8c0a86c4d609f4826c62604aa90dab6de2c7f409480133954f1c8c48f856758b4f1a324dc6cea2090fac9d6
+  metadata.gz: f643dea4d15f217f5aa90e45d53c4eb9bce152465f543b8f3c98291363f9f662d8ee90f63d8b7292388cb8d1423622268bec0a6e778a0c270018f39e2c2f5a93
+  data.tar.gz: c1738314439b883d66baf8f78e7db6249ee196d8ca4f00d0c7d76d658a5783424ec677dd9092f17f8188c4566fd4a369be80eb70bf0ae46beb03610a692efa81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.3.1)
+    indocker (0.3.2)
       net-ssh
 
 GEM
@@ -11,7 +11,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     method_source (1.0.0)
-    net-ssh (7.0.1)
+    net-ssh (7.1.0)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/lib/indocker/images/image.rb

@@ -1,9 +1,8 @@
 class Indocker::Images::Image
-  attr_reader :name
-  attr_reader :dependent_images
-  attr_reader :build_args
+  attr_reader :name, :compile, :compile_rpaths, :dependent_images, :build_args
 
   def initialize(name)
+    @compile = false
     @name = name
     @dependent_images = []
     @build_args = {}
@@ -37,6 +36,30 @@ class Indocker::Images::Image
     @dockerfile = path
   end
 
+  def compile?(path)
+    return false if !@compile
+    return true if @compile_rpaths.empty?
+    return true if @compile_rpaths.any? { |rpath| path.include?(rpath) }
+    return false
+  end
+
+  def set_compile(flag_or_rpaths)
+    @compile_rpaths = []
+
+    if flag_or_rpaths == false
+      @compile = false
+      return
+    end
+
+    @compile = true
+
+    if flag_or_rpaths.is_a?(Array)
+      @compile_rpaths = flag_or_rpaths
+    end
+
+    @dockerfile = path
+  end
+
   def dockerfile
     @dockerfile || (raise ArgumentError.new("Dockerfile path is not set for image :#{@name}"))
   end

data/lib/indocker/images/image_builder.rb

@@ -43,6 +43,10 @@ class Indocker::Images::ImageBuilder
     self
   end
 
+  def compile(flag_or_file_paths)
+    @image.set_compile(flag_or_file_paths)
+  end
+
   def depends_on(*image_list)
     if !image_list.is_a?(Array)
       image_list = [image_list]

data/lib/indocker/images/image_compiler.rb

@@ -40,7 +40,7 @@ class Indocker::Images::ImageCompiler
       templates_compiler = Indocker::Images::TemplatesCompiler.new
 
       templates_compiler.compile(
-        templates_dir: image.build_context,
+        image: image,
         compile_dir: compile_dir,
         context: build_context
       )
@@ -50,7 +50,7 @@ class Indocker::Images::ImageCompiler
 
     target_dockerfile = File.join(compile_dir, 'Dockerfile')
     FileUtils.cp(image.dockerfile, target_dockerfile)
-    compiler.compile(target_dockerfile, build_context)
+    compiler.compile(target_dockerfile, build_context, image)
 
     File
       .join(compile_dir, '.dockerignore')

data/lib/indocker/images/template_compiler.rb

@@ -1,7 +1,12 @@
 require 'erb'
 
 class Indocker::Images::TemplateCompiler
-  def compile(path, context)
+  def compile(path, context, image)
+    if !image.compile?(file)
+      Indocker.logger.debug("skipping ERB compilation for #{path}".grey)
+      return
+    end
+
     Indocker.logger.debug("compiling template file #{path}".grey)
     template = File.read(path)
     content = ERB.new(template).result(context.helper.get_binding)

data/lib/indocker/images/templates_compiler.rb

@@ -2,14 +2,15 @@ require 'erb'
 require 'fileutils'
 
 class Indocker::Images::TemplatesCompiler
-  def compile(templates_dir:, compile_dir:, context:)
+  def compile(image:, compile_dir:, context:)
+    templates_dir = image.build_context
     prepare_dirs!(templates_dir, compile_dir)
 
     compiler = Indocker::Images::TemplateCompiler.new
 
     Dir[File.join(compile_dir, '**/**')].each do |file|
       next if !File.file?(file)
-      compiler.compile(file, context)
+      compiler.compile(file, context, image)
     end
   end
 

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh