build-labels 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d76686ba12eb2b69d551840ee5d99f05353e75e6db83c06ae9352fe36f63f2
-  data.tar.gz: 2b1118b96e92281fce14722e18b6b898ed650c8b14a7e036ca581fd6fa72a267
+  metadata.gz: 7c019e99a75702daa4a23d0b2910cc831042d71b2994c9b647f165e1b9a83593
+  data.tar.gz: d3ef13fbd884faa4ff971af506fe21e1dd9b68db7e4912c852f48747616efbe8
 SHA512:
-  metadata.gz: c339263b0003bf89d8f428678bba701c7be56b24c63381095cece85cb9bea491c726497d328a0090c8e1b43a251fa98df413a2352d8c6df36093dba478f8b7dd
-  data.tar.gz: 85dbc77af8be5fdb2dfa177a98d965e178d2c2ab3d19ca3c3043a38bc51c29a251b65857e97cfc6cd010a042942542cfb7fe6d5c6f073c1012c6a2549debca9b
+  metadata.gz: 7faa19f70fd4bd93dca085100b0eb26ce8d77c8ff1f12653d9bb8ef185767ebba4fa9f0347fe0c9ab4be3d8eaf21f07400ce380e54010b4c0be9417592af29d9
+  data.tar.gz: 7b7e772113a9e9c48cc467d9aa0538fd566f98083661247585d96be6beff03f65b7d834e1b82599d79e2638fb02bde448b4fd497d19112f36338831a21e0bfb7

data/bin/build-labels

@@ -5,7 +5,10 @@ $LOAD_PATH << lib
 
 require 'build-labels'
 require 'build-labels/command_line'
+require 'build-labels/command_to_compose'
+require 'build-labels/command_to_dockerfiles'
 require 'build-labels/command_gitlab'
+require 'build-labels/command_print'
 
 include BuildLabels
 

data/examples/Dockerfile

@@ -0,0 +1,2 @@
+FROM ruby:3.1.2-alpine AS deploy
+CMD sh -c ' echo Build $CI_COMMIT_BRANCH @ $CI_COMMIT_SHORT_SHA $CI_COMMIT_TIMESTAMP '

data/lib/build-labels/builder.rb

@@ -43,9 +43,15 @@ module BuildLabels
       end
     end
 
-    def extend_compose(compose_text)
+    def each_labels
       generate_label_schema
       apply_environment
+      @namespaces.each do |ns, values|
+        yield ns, values
+      end
+    end
+
+    def extend_compose(compose_text)
       compose = YAML.load compose_text
       compose['services'].each do |name, service|
         next unless service['build']
@@ -54,7 +60,7 @@ module BuildLabels
         end
         service['build']['labels'] ||= []
 
-        @namespaces.each do |ns, values|
+        each_labels do |ns, values|
           values.each_pair do |k,v|
             service['build']['labels'] << "#{ns}.#{k}=#{v}" unless v.to_s.empty?
           end

data/lib/build-labels/command_gitlab.rb

@@ -1,7 +1,7 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:gitlab] = Class.new do
-  def run(builder, params)
+  def run(builder, params, compose_text)
     builder.oc.vendor = '$CI_SERVER_URL/$GITLAB_USER_LOGIN'
     builder.oc.authors = '$CI_SERVER_URL/$GITLAB_USER_LOGIN'
     builder.oc.revision = '$CI_COMMIT_SHA'
@@ -23,6 +23,9 @@ BuildLabels::CommandLine::COMMANDS[:gitlab] = Class.new do
     builder.gitlab.cijoburl = '$CI_JOB_URL'
     builder.gitlab.mrurl = '$CI_PROJECT_URL/-/merge_requests/$CI_MERGE_REQUEST_ID'
     builder.gitlab.tag = '$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA'
+    builder.gitlab.commit_branch = '$CI_COMMIT_BRANCH'
+    builder.gitlab.commit_short_sha = '$CI_COMMIT_SHORT_SHA'
+    builder.gitlab.commit_timestamp = '$CI_COMMIT_TIMESTAMP'
 
     # org.opencontainers.image.title BUILDTITLE=$(echo $CI_PROJECT_TITLE | tr " " "_")
     # org.opencontainers.image.description

data/lib/build-labels/command_line.rb

@@ -47,21 +47,23 @@ module BuildLabels
           o.on('-e', '--env FILE', 'Load .build_info FILE') { load_env _1 }
           o.on('-n', '--no-env', 'Do not process env variables') { true }
           o.on('-h', '--help') { puts o; exit }
-          o.parse! args, into: params
+          rest = o.parse! args, into: params
 
-          raise 'Compose file not defined' if $stdin.tty? && !params[:compose]
-
-          command = args.shift || ''
-          raise "Unknown command: #{command}" unless COMMANDS.key?(command.to_sym)
 
           compose_text = File.read(params[:compose]) if params[:compose]
           compose_text ||= STDIN.read unless $stdin.tty?
 
           builder = Builder.new
-          COMMANDS[command.to_sym].run builder, params
+
           #  eval $(grep -v -e '^#' .build_info | xargs -I {} echo export \'{}\') && echo $CI_COMMIT_AUTHOR
+          if rest === ['gitlab'] && compose_text
+            rest = ['gitlab', 'to_compose']
+          end
 
-          builder.extend_compose compose_text
+          rest.each do |command|
+            raise "Unknown command: #{command}" unless COMMANDS.key?(command.to_sym)
+            COMMANDS[command.to_sym].run builder, params, compose_text
+          end
         rescue => e
           puts e.message
           exit 1

data/lib/build-labels/command_print.rb

@@ -0,0 +1,15 @@
+require_relative 'command_line'
+
+BuildLabels::CommandLine::COMMANDS[:print] = Class.new do
+  def run(builder, params, compose_text)
+    builder.each_labels do |ns, values|
+      values.each_pair do |k,v|
+        puts "#{ns}.#{k}=#{v}" unless v.to_s.empty?
+      end
+    end
+  end
+
+  def help = 'Print labels to stdout'
+end.new
+
+

data/lib/build-labels/command_to_compose.rb

@@ -0,0 +1,13 @@
+require_relative 'command_line'
+
+BuildLabels::CommandLine::COMMANDS[:to_compose] = Class.new do
+  def run(builder, params, compose_text)
+    raise 'Compose file not defined' unless compose_text
+
+    builder.extend_compose compose_text
+  end
+
+  def help = 'Add labels to all build sections of docker-compose file'
+end.new
+
+

data/lib/build-labels/command_to_dockerfiles.rb

@@ -0,0 +1,34 @@
+require_relative 'command_line'
+
+BuildLabels::CommandLine::COMMANDS[:to_dockerfiles] = Class.new do
+  def run(builder, params, compose_text)
+    raise 'Compose file not defined' unless compose_text
+    compose_dir = params[:compose] ? File.dirname(params[:compose]) : '.'
+
+    compose = YAML.load compose_text
+    compose['services'].each do |name, svc|
+      next unless svc['build']
+
+      dockerfile = svc['build'].is_a?(String) ? svc['build'] : [svc['build']['context'], svc['build']['dockerfile']].compact.join('/')
+      dockerfile = File.expand_path dockerfile, compose_dir
+      raise "file ot found: #{dockerfile}" unless File.exist? dockerfile
+
+      dockerfile_lines = File.readlines(dockerfile).map(&:strip)
+
+      builder.each_labels do |ns, values|
+        values.each_pair do |k, v|
+          next if v.to_s.empty?
+
+          name = "#{ns}.#{k}".gsub('.', '_').upcase
+          line = "ENV #{name}=\"#{v}\""
+          dockerfile_lines.push line unless dockerfile_lines.grep(/ENV\s+#{name}=/).any?
+        end
+      end
+      File.write dockerfile, dockerfile_lines.join("\n")
+    end
+  end
+
+  def help = 'Add ENVs to Dockerfiles from docker-compose file'
+end.new
+
+

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,11 +102,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/build-labels
+- examples/Dockerfile
 - examples/simple-compose.yml
 - lib/build-labels.rb
 - lib/build-labels/builder.rb
 - lib/build-labels/command_gitlab.rb
 - lib/build-labels/command_line.rb
+- lib/build-labels/command_print.rb
+- lib/build-labels/command_to_compose.rb
+- lib/build-labels/command_to_dockerfiles.rb
 - lib/version.rb
 homepage: https://rubygems.org/gems/build-labels
 licenses: