build-labels 0.0.22 → 0.0.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 50511bc850b411617f1d5c516593dbfe886de1d4230e76b3036c70ac9e7fa91e
4
- data.tar.gz: 6f1d316b6941a45bd0451e17b322854172d9e1a5eb55eca39bb7039e2bcf1120
3
+ metadata.gz: fd7ab1245c1d04bebef6f2aaca6741ea9529e59158f3fdf0beeaecbf516ca868
4
+ data.tar.gz: d07338cffd8ad2d6cd610d3f35291996b7d8477f475724f5f162d14089caeaff
5
5
  SHA512:
6
- metadata.gz: c3e4df0698922db01f4526405a9ce7c694a6fea149e86d4fbd90142ca6e1781cf8d2a22cb534049da6853b8fb3662cb65695c470fe099000fa4d06f15d3f30b2
7
- data.tar.gz: 4afcd88dcf92dcf78f9c938a0902e486db8f10981f42b4a659877c4b5b2ae52f2c76ef5e3167713b48e424727424eb667ff16a640c586311f826df8438205d89
6
+ metadata.gz: '096a1d7fd6cea945e5f6a0cce84456396ac028698c0999eb017ea3d0136206f65e3115318f7cd684ed3b9320ce9e95e00f7b4d9132383dceb9f3098aa068f685'
7
+ data.tar.gz: bcce2f8607691a553192c0dcfcbcb8e2a1de3c02657c7793e20d5c2728af39dc158598c7df6eb644e58e12b0de83c2675f58199034886a1c90a4b8ff6ba55f40
@@ -5,6 +5,13 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
5
5
  # parser.on('', '--set-version', '')
6
6
  # end
7
7
 
8
+
9
+ def apply_gitlab_tag(tag)
10
+ return tag if ENV['CI_COMMIT_TAG'].to_s.empty?
11
+ git_tag = ENV['CI_COMMIT_TAG']
12
+ [tag,git_tag].compact.join '-'
13
+ end
14
+
8
15
  def run(builder, params, compose)
9
16
  raise 'Compose file not defined' unless compose
10
17
 
@@ -19,11 +26,15 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
19
26
  current_version = File.read(versionfile).strip
20
27
  image = svc['image'].gsub( /:.*/, '')
21
28
  tag = svc['image'][/:(.*)/, 1]
29
+
30
+ tag = apply_gitlab_tag(tag)
22
31
  svc['image'] = "#{image}:#{current_version}#{tag ? "-" + tag : ""}"
32
+
23
33
  next unless svc['build']['tags']
24
34
  svc['build']['tags'] = svc['build']['tags'].map do |t|
25
35
  image = t.gsub( /:.*/, '')
26
36
  tag = t[/:(.*)/, 1]
37
+ tag = apply_gitlab_tag(tag)
27
38
  "#{image}:#{current_version}#{tag ? "-" + tag : ""}"
28
39
  end
29
40
  end
data/lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BuildLabels
2
2
  class Builder
3
- VERSION = '0.0.22'
3
+ VERSION = '0.0.24'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: build-labels
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.22
4
+ version: 0.0.24
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-07-29 00:00:00.000000000 Z
11
+ date: 2025-01-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -121,7 +121,7 @@ licenses:
121
121
  - Nonstandard
122
122
  metadata:
123
123
  source_code_uri: https://github.com/artyomb/build-labels
124
- post_install_message:
124
+ post_install_message:
125
125
  rdoc_options: []
126
126
  require_paths:
127
127
  - lib
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
137
137
  version: '0'
138
138
  requirements: []
139
139
  rubygems_version: 3.3.7
140
- signing_key:
140
+ signing_key:
141
141
  specification_version: 4
142
142
  summary: Generate docker build image labels from CI variables
143
143
  test_files: []