dapp 0.22.8 → 0.22.9
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 87d870e47e02c8023739cbb69023773078cfaba2
|
4
|
+
data.tar.gz: 964af737b236f914d3ad849ff89dad31da62450b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 63ba1bb29b00a230b9394d6164789058afc82040144c9f832606731df41693facb7bb824d2c74e9bbbbb05322918fb2400607ff0f28510cb3bcd31c05dfaa75f
|
7
|
+
data.tar.gz: 203d94c7fe95ddd34635459e4d789c0e4b13b91adddcb60e3b12ab9f0fbe9a564b5a5050710f273d08a72dfaef7cdd1de49f76a876efade3361fb51b267f680b
|
data/lib/dapp/dapp.rb
CHANGED
@@ -188,8 +188,8 @@ module Dapp
|
|
188
188
|
def docker_credentials
|
189
189
|
if options.key?(:registry_username) && options.key?(:registry_password)
|
190
190
|
[options[:registry_username], options[:registry_password]]
|
191
|
-
elsif ENV.key?('
|
192
|
-
['gitlab-ci-token', ENV['
|
191
|
+
elsif ENV.key?('CI_JOB_TOKEN')
|
192
|
+
['gitlab-ci-token', ENV['CI_JOB_TOKEN']]
|
193
193
|
end
|
194
194
|
end
|
195
195
|
|
@@ -24,10 +24,12 @@ BANNER
|
|
24
24
|
boolean: true
|
25
25
|
|
26
26
|
option :registry_username,
|
27
|
-
long: '--registry-username USERNAME'
|
27
|
+
long: '--registry-username USERNAME',
|
28
|
+
default: ENV.key?("DAPP_DIMG_CLEANUP_REGISTRY_PASSWORD") ? : "dapp-cleanup-repo" : nil # FIXME: https://gitlab.com/gitlab-org/gitlab-ce/issues/41384
|
28
29
|
|
29
30
|
option :registry_password,
|
30
|
-
long: '--registry-password PASSWORD'
|
31
|
+
long: '--registry-password PASSWORD',
|
32
|
+
default: ENV["DAPP_DIMG_CLEANUP_REGISTRY_PASSWORD"] # FIXME: https://gitlab.com/gitlab-org/gitlab-ce/issues/41384
|
31
33
|
|
32
34
|
def run(argv = ARGV)
|
33
35
|
self.class.parse_options(self, argv)
|
@@ -76,15 +76,23 @@ module Dapp
|
|
76
76
|
%w(git_tag git_commit).each_with_object([]) do |scheme, dimgs_images|
|
77
77
|
dimgs_images.concat begin
|
78
78
|
detailed_dimgs_images_by_scheme[scheme].map do |dimg|
|
79
|
+
next if dry_run? && begin
|
80
|
+
if scheme == 'git_tag'
|
81
|
+
!consistent_git_tags.include?(dimg[:tag])
|
82
|
+
elsif scheme == 'git_commit'
|
83
|
+
!git_local_repo.commit_exists?(dimg[:tag])
|
84
|
+
end
|
85
|
+
end
|
86
|
+
|
79
87
|
dimg[:created_at] = begin
|
80
88
|
if scheme == 'git_tag'
|
81
|
-
git_local_repo.tag_at(dimg[:tag])
|
89
|
+
git_local_repo.tag_at(git_tag_by_consistent_git_tag(dimg[:tag]))
|
82
90
|
elsif scheme == 'git_commit'
|
83
91
|
git_local_repo.commit_at(dimg[:tag])
|
84
92
|
end
|
85
93
|
end
|
86
94
|
dimg
|
87
|
-
end
|
95
|
+
end.compact
|
88
96
|
end
|
89
97
|
end.tap do |detailed_dimgs_images|
|
90
98
|
sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }
|
data/lib/dapp/version.rb
CHANGED