dapp 0.7.10 → 0.7.11
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 +4 -4
- data/lib/dapp/config/dimg/instance_methods.rb +3 -3
- data/lib/dapp/dimg.rb +1 -1
- data/lib/dapp/image/stage.rb +2 -1
- data/lib/dapp/project/logging/base.rb +2 -2
- data/lib/dapp/project/logging/process.rb +2 -2
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 753069f8c28bcede5ca0d3f6f5f5419135c7fab9
|
|
4
|
+
data.tar.gz: 88812ab9b681784bec6288903e34be896b78a861
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0ceb1e79ce7906f40384410cab6d35098e3dffe2e591194e74e6b4a8beb01453a995634d037c6113a6c7aaf09c2868b0e5b8afd6e81b6f25d9f05dce851e8cb4
|
|
7
|
+
data.tar.gz: 2ab1fc615718fae7ffc543e84dd1979be9ca97e4b1c5f89c8ec5d10c64fcdb5209920e7842494f4fecd5afbad81c0359c21958236e1b8931c894f6e4e5282ff6
|
|
@@ -41,9 +41,9 @@ module Dapp
|
|
|
41
41
|
end
|
|
42
42
|
end
|
|
43
43
|
|
|
44
|
-
def git(
|
|
45
|
-
type =
|
|
46
|
-
_git_artifact.send(type,
|
|
44
|
+
def git(url = nil, &blk)
|
|
45
|
+
type = url.nil? ? :local : :remote
|
|
46
|
+
_git_artifact.send(type, url, &blk)
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
def mount(to, &blk)
|
data/lib/dapp/dimg.rb
CHANGED
|
@@ -40,7 +40,7 @@ module Dapp
|
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
def tag!(tag)
|
|
43
|
-
project.lock("#{
|
|
43
|
+
project.lock("#{project.name}.images", readonly: true) do
|
|
44
44
|
dimg_name = config._name
|
|
45
45
|
if project.dry_run?
|
|
46
46
|
project.log_state(dimg_name, state: project.t(code: 'state.tag'), styles: { status: :success })
|
data/lib/dapp/image/stage.rb
CHANGED
|
@@ -72,7 +72,8 @@ module Dapp
|
|
|
72
72
|
raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
|
|
73
73
|
project.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
|
|
74
74
|
rescue Error::Shellout => error
|
|
75
|
-
project.
|
|
75
|
+
project.log_info(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container },
|
|
76
|
+
quiet: !project.log_verbose?)
|
|
76
77
|
|
|
77
78
|
raise unless project.introspect_error? || project.introspect_before_error?
|
|
78
79
|
built_id = project.introspect_error? ? commit! : from.built_id
|
|
@@ -72,8 +72,8 @@ module Dapp
|
|
|
72
72
|
log_warning(*args, **kwargs)
|
|
73
73
|
end
|
|
74
74
|
|
|
75
|
-
def log(message = '', desc: nil, inline: false, **kwargs)
|
|
76
|
-
return if log_quiet?
|
|
75
|
+
def log(message = '', desc: nil, inline: false, quiet: false, **kwargs)
|
|
76
|
+
return if quiet || log_quiet?
|
|
77
77
|
unless desc.nil?
|
|
78
78
|
(desc[:data] ||= {})[:msg] = message
|
|
79
79
|
message = t(**desc)
|
|
@@ -40,9 +40,9 @@ module Dapp
|
|
|
40
40
|
|
|
41
41
|
if log_verbose? && !short
|
|
42
42
|
process ||= t(code: 'status.process.default')
|
|
43
|
-
log_process_verbose(message, process: process, style: style, status: status, &blk)
|
|
43
|
+
log_process_verbose(message.to_s, process: process, style: style, status: status, &blk)
|
|
44
44
|
else
|
|
45
|
-
log_process_short(message, style: style, status: status, &blk)
|
|
45
|
+
log_process_short(message.to_s, style: style, status: status, &blk)
|
|
46
46
|
end
|
|
47
47
|
end
|
|
48
48
|
# rubocop:enable Metrics/ParameterLists
|
data/lib/dapp/version.rb
CHANGED