dapp 0.35.5 → 0.35.6
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
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f6da308baee3d0be11b5b9057a8c67634fdaed1b3b23d7e6ffe31ea32c6d85b2
|
4
|
+
data.tar.gz: c17ba9e63b18eb0e08ba3c601e604b4ebd069fe1695172dc32e97c8a90249a7b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d458e443c0df94e353ddcaa837aff69493d67fbfa5e09ce7994b11dfaa668b1b7b3f15b2b7fa94b841a14a06252a6df027d89c1819a9e04580a4056562780946
|
7
|
+
data.tar.gz: 76b408686d669d451d72e90a4be372e58276dca209d783f1c4b15c4ada4bd5595fbdf8d6ac12bc69ba168ddd1e3e2452ebe208effca6243eddcd0023f50011e8
|
data/lib/dapp/dapp.rb
CHANGED
@@ -59,7 +59,7 @@ module Dapp
|
|
59
59
|
ruby2go_init
|
60
60
|
|
61
61
|
setup_ssh_agent
|
62
|
-
try_host_docker_login
|
62
|
+
try_host_docker_login unless !!options[:ignore_try_host_docker_login]
|
63
63
|
end
|
64
64
|
|
65
65
|
def options
|
@@ -245,7 +245,7 @@ module Dapp
|
|
245
245
|
if options[:registry_username] && options[:registry_password]
|
246
246
|
[options[:registry_username], options[:registry_password]]
|
247
247
|
elsif ENV.key?('DAPP_DOCKER_CONFIG')
|
248
|
-
elsif !gcr_registry? && !ENV.key?('DAPP_IGNORE_CI_DOCKER_AUTOLOGIN') && ENV.key?('CI_JOB_TOKEN')
|
248
|
+
elsif !gcr_registry? && !ENV.key?('DAPP_IGNORE_CI_DOCKER_AUTOLOGIN') && ENV.key?('CI_REGISTRY') && ENV.key?('CI_JOB_TOKEN')
|
249
249
|
['gitlab-ci-token', ENV['CI_JOB_TOKEN']]
|
250
250
|
end
|
251
251
|
end
|
@@ -16,7 +16,7 @@ BANNER
|
|
16
16
|
def run(argv = ARGV)
|
17
17
|
self.class.parse_options(self, argv)
|
18
18
|
repo = self.class.required_argument(self, 'repo')
|
19
|
-
run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
|
19
|
+
run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo, ignore_try_host_docker_login: true))
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
@@ -64,7 +64,11 @@ module Dapp
|
|
64
64
|
log([repo_image[:dimg], repo_image[:tag]].compact.join(':')) if dry_run? || log_verbose?
|
65
65
|
unless dry_run?
|
66
66
|
begin
|
67
|
-
|
67
|
+
if self.class.gcr_registry?
|
68
|
+
registry.gcr_image_delete(repo_image[:tag], repo_image[:dimg])
|
69
|
+
else
|
70
|
+
registry.image_delete(repo_image[:tag], repo_image[:dimg])
|
71
|
+
end
|
68
72
|
rescue ::Dapp::Dimg::Error::Registry => e
|
69
73
|
raise unless e.net_status[:data][:message].include?("MANIFEST_UNKNOWN")
|
70
74
|
log_warning "WARNING: Ignore dimg `#{repo_image[:dimg]}` tag `#{repo_image[:tag]}`: got not-found-error from docker registry on image-delete request: #{e.net_status[:data][:message]}"
|
@@ -22,8 +22,20 @@ module Dapp
|
|
22
22
|
ruby2go_docker_registry_command(command: :image_config, options: { reference: tag_reference(tag) })
|
23
23
|
end
|
24
24
|
|
25
|
+
def gcr_image_delete(tag)
|
26
|
+
image_delete_by_tag(tag)
|
27
|
+
end
|
28
|
+
|
25
29
|
def image_delete(tag)
|
26
30
|
digest = image_digest(tag)
|
31
|
+
image_delete_by_digest(digest)
|
32
|
+
end
|
33
|
+
|
34
|
+
def image_delete_by_tag(tag)
|
35
|
+
ruby2go_docker_registry_command(command: :image_delete, options: { reference: tag_reference(tag) })
|
36
|
+
end
|
37
|
+
|
38
|
+
def image_delete_by_digest(digest)
|
27
39
|
ruby2go_docker_registry_command(command: :image_delete, options: { reference: digest_reference(digest) })
|
28
40
|
end
|
29
41
|
|
@@ -41,6 +41,10 @@ module Dapp
|
|
41
41
|
with_dimg_repository(dimg_repository.to_s) { super(tag) }
|
42
42
|
end
|
43
43
|
|
44
|
+
def gcr_image_delete(tag, dimg_repository = nil)
|
45
|
+
with_dimg_repository(dimg_repository.to_s) { super(tag) }
|
46
|
+
end
|
47
|
+
|
44
48
|
def image_delete(tag, dimg_repository = nil)
|
45
49
|
with_dimg_repository(dimg_repository.to_s) { super(tag) }
|
46
50
|
end
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.35.
|
4
|
+
version: 0.35.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Stolyarov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-09-
|
11
|
+
date: 2018-09-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|