dry-dock 0.1.1 → 0.1.2
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/VERSION +1 -1
- data/dry-dock.gemspec +2 -2
- data/lib/drydock/phase_chain.rb +10 -2
- 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: ef4755b8fb67f4a9be9cedd7b34c2f3973fe8ba2
|
|
4
|
+
data.tar.gz: a19658f0006572ad6321e19a2cc7f170bf2b1ec5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 82a85bc7b40c024711ff4a0414af0a4cdcade29f44c5f3d73f71876339b2445a2398775f06061ac854e45ea5d873b2b9ca1ede567dca5d7fc8930764c73a22cb
|
|
7
|
+
data.tar.gz: 6732586269516b09b7e65c1b10eb4ff513050879d9fa4f56ee3a8750ec4bbe452c6ceea35474a94c67d8a5fb8e3014b38f34ff5ab2a5084e6ff156a38039b8b9
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.2
|
data/dry-dock.gemspec
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
|
-
# stub: dry-dock 0.1.
|
|
5
|
+
# stub: dry-dock 0.1.2 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "dry-dock"
|
|
9
|
-
s.version = "0.1.
|
|
9
|
+
s.version = "0.1.2"
|
|
10
10
|
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
12
12
|
s.require_paths = ["lib"]
|
data/lib/drydock/phase_chain.rb
CHANGED
|
@@ -38,6 +38,13 @@ module Drydock
|
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
(cc[:OnBuild] ||= []).push(opts[:on_build]) if opts.key?(:on_build)
|
|
41
|
+
|
|
42
|
+
[:connect_timeout, :read_timeout].each do |key|
|
|
43
|
+
if opts.key?(key)
|
|
44
|
+
cc[:meta_options] ||= {}
|
|
45
|
+
cc[:meta_options][key] = opts[key]
|
|
46
|
+
end
|
|
47
|
+
end
|
|
41
48
|
end
|
|
42
49
|
end
|
|
43
50
|
|
|
@@ -49,8 +56,9 @@ module Drydock
|
|
|
49
56
|
end
|
|
50
57
|
end
|
|
51
58
|
|
|
52
|
-
def self.create_container(cfg,
|
|
53
|
-
|
|
59
|
+
def self.create_container(cfg, &blk)
|
|
60
|
+
meta_options = cfg.fetch(:meta_options, {})
|
|
61
|
+
timeout = meta_options.fetch(:read_timeout, Excon.defaults[:read_timeout]) || 60
|
|
54
62
|
|
|
55
63
|
Docker::Container.create(cfg).tap do |c|
|
|
56
64
|
t = Thread.new do
|