build-labels 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec498cbc10336a3948caf8d7f00c727a470313334c40d991df4bdaa242b52e2
-  data.tar.gz: fb2e1057d222673564957cea9aac81ee29d80f2b1434af9430933ca4d19e44ca
+  metadata.gz: 16c94f8ee0325f5a908ff99778c8e590c93ccd270dadc7df019c86e586bc788c
+  data.tar.gz: 1be4edf51d1bc84e8ea74168b1d5fb1f81f83582f2bfc5d8e9d4b9f9f8dee078
 SHA512:
-  metadata.gz: b67676c6fcbb6dca1fc79f4e7e946464a90db61b39ad2c8e262bce0d7b04ae533a38aa7cdedc39beb0d036ca92173fbd036d0db678af372429aa69ea45617dc0
-  data.tar.gz: c840ad0c2058f3d4f2cdc964913b28aa33dd67320a348e128535c81c81c8c81217c4b3145c3fb45fd42649690c15b9a3dfc621bd55acf4b772f6b319f8d9a1b7
+  metadata.gz: c58fd66950b1d37f491989ae511efbaa6715f4072b630be97ca85cabd14aaf24c91b41d22d87d7c29e37445c8be472cfc59b6a378e8b45c685b9e8cf429a0a7a
+  data.tar.gz: 4fa922c024bfe2b1ae6169eb57633093726015bc4b195030ab8f8ed74981d5956ede6f66b6f24cf75c393628142e20decf64fcf937f6d53bc6dc084d3426ed70

data/examples/simple-compose.yml

@@ -6,4 +6,9 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+  service-b:
+    image: service-a
+    build: .
+  service-c:
+    image: service-a
 

data/lib/build-labels/builder.rb

@@ -68,6 +68,9 @@ module BuildLabels
           end
         end
       end
+      compose['services'].delete_if do |name, svc|
+        ! svc.key?('build')
+      end
       puts compose.to_yaml
     end
   end

data/lib/build-labels/command_cache.rb

@@ -1,18 +1,32 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:cache] = Class.new do
+  def options(parser)
+    parser.on('', '--cache-from CACHE FROM', 'type=[local,registry] ... ')
+    parser.on('', '--cache-to CACHE TO', 'type=[local,registry] ...')
+  end
   def run(builder, params, compose_text)
     compose = YAML.load compose_text
-    compose['services'].each do |name, service|
+    compose['services'].each do |service_name, service|
       next unless service['build']
 
       if service['build'].class == String
         service['build'] = { 'context' => service['build'] }
       end
+      # p params
       # registry = params[:registry]
       image = service['image'].gsub( /:.*/, '')
-      service['build']['cache_from'] = [ "type=registry,ref=#{image}:cache" ]
-      service['build']['cache_to'] = [ "type=registry,ref=#{image}:cache,mode=max" ]
+      if params[:'cache-from']
+        service['build']['cache_from'] = [ params[:'cache-from'] % {image: image, service_name: service_name} ]
+      else
+        service['build']['cache_from'] = [ "type=registry,ref=#{image}:cache" ]
+      end
+
+      if params[:'cache-to']
+        service['build']['cache_to'] = [ params[:'cache-to'] % {image: image, service_name: service_name} ]
+      else
+        service['build']['cache_to'] = [ "type=registry,ref=#{image}:cache,mode=max" ]
+      end
       # #        - type=local,src=./.cache
       # #        - type=local,dest=./.cache,mode=max
     end

data/lib/build-labels/command_line.rb

@@ -46,6 +46,8 @@ module BuildLabels
           o.on('-c', '--compose COMPOSE_FILE', 'Compose file')
           o.on('-e', '--env FILE', 'Load .build_info FILE') { load_env _1 }
           o.on('-n', '--no-env', 'Do not process env variables') { true }
+          COMMANDS.values.select{_1.options(o) if _1.respond_to? :options }
+
           o.on('-h', '--help') { puts o; exit }
           rest = o.parse! args, into: params
 

data/lib/build-labels/command_to_dockerfiles.rb

@@ -12,7 +12,7 @@ BuildLabels::CommandLine::COMMANDS[:to_dockerfiles] = Class.new do
       dockerfile = svc['build'].is_a?(String) ? svc['build'] : svc['build']['context']
       dockerfile = File.join dockerfile, (svc['build']['dockerfile'] || 'Dockerfile')
       dockerfile = File.expand_path dockerfile, compose_dir
-      raise "file ot found: #{dockerfile}" unless File.exist? dockerfile
+      raise "file not found: #{dockerfile}" unless File.exist? dockerfile
 
       dockerfile_lines = File.readlines(dockerfile).map(&:rstrip)
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.13'
+    VERSION = '0.0.15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake