dock0 0.2.9 → 0.3.0

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: 5bfcec4e9449bb947d140d9f5170c853347c72b2
4
- data.tar.gz: 25330447a67a1a60655e9bc1e44161decd0c731e
3
+ metadata.gz: b4ef255c069bf314b8c1f1108d0215ca2d42b94f
4
+ data.tar.gz: bc3b05cfc4b6da6e16860c5506d80689e9009dd2
5
5
  SHA512:
6
- metadata.gz: 9c1b3bd103eed81464c5e310d25877b053690f1df7ddcabf769c30a6833443874a260027bb0689a7a7bf4f59e02f4e2ef7f0ebf2a9bb5c08be9f611ad0b3ddcd
7
- data.tar.gz: a38460650f598efa379ae7103369f506094b7893e468dfbead4dc0f254c77d36ffcbea60cb583e78e01fd2c89fb72a85f8c78a89592caeee472aef243f5fe797
6
+ metadata.gz: 7d021f20b9729deb9548d7507c7b5b41d213fbc40a9317e46301f87899c8882554dda8e6686a85fc9df33c37f2978c8b569423fe6777708802da98b8421012e8
7
+ data.tar.gz: 7002494fe80e3ad94343c5fd0a8d2ee49965bc569acdd873e280c2867f02295dd1b448180b8f359cbca52e397745d3a8b23f681e65293045f18b957fa3992f01
@@ -1,15 +1,15 @@
1
1
  language: ruby
2
2
  cache: bundler
3
+ sudo: false
3
4
  rvm:
4
- - 2.1.2
5
- - 2.1.1
6
- - 2.1.0
7
- - 2.0.0
8
- - 1.9.3
5
+ - 2.2.0
6
+ - 2.1.5
7
+ - 2.0.0-p598
8
+ - 1.9.3-p551
9
9
  notifications:
10
10
  email: false
11
11
  irc:
12
- channels:
13
- - secure: dfWgouxmAn52BMnVIonQJv4XXXL+9nMRehTQIESu67yZF8laXmLfXFTer20OqLeHfjU94TL2LKaijzR1jlMKwwwe6960vsaWMlX4Lx9BK3OKDHO0d2+IpqrmKwlKyA2dfLTf0SX8VpaF6YNt88V6Zk7uiaiU9ea+9qYkBsFp2vc=
14
12
  template:
15
13
  - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"
14
+ channels:
15
+ - irc.oftc.net#akerl
data/README.md CHANGED
@@ -10,6 +10,11 @@ dock0
10
10
 
11
11
  Component generator for building Arch systems
12
12
 
13
+ For information on how this is used, check out my blog posts:
14
+
15
+ * [The original workflow](http://blog.akerl.org/2014/01/30/dock0-minimal-docker-host/)
16
+ * [Newer layout, with more features](http://blog.akerl.org/2014/12/17/dock0-round-2/)
17
+
13
18
  ## Usage
14
19
 
15
20
  ### Build a rootfs
@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
18
18
  s.executables = ['dock0']
19
19
 
20
20
  s.add_dependency 'mercenary', '~> 0.3.4'
21
- s.add_dependency 'menagerie', '~> 0.0.1'
21
+ s.add_dependency 'menagerie', '~> 1.0.0'
22
+ s.add_dependency 'meld', '~> 1.0.0'
22
23
 
23
- s.add_development_dependency 'rubocop', '~> 0.28.0'
24
+ s.add_development_dependency 'rubocop', '~> 0.29.0'
24
25
  s.add_development_dependency 'rake', '~> 10.4.0'
25
26
  s.add_development_dependency 'coveralls', '~> 0.7.1'
26
- s.add_development_dependency 'rspec', '~> 3.1.0'
27
+ s.add_development_dependency 'rspec', '~> 3.2.0'
27
28
  s.add_development_dependency 'fuubar', '~> 2.0.0'
28
29
  end
@@ -1,6 +1,7 @@
1
1
  require 'yaml'
2
2
  require 'English'
3
3
  require 'fileutils'
4
+ require 'meld'
4
5
 
5
6
  ##
6
7
  # Dock0 provides an interface for building Arch images
@@ -30,7 +31,7 @@ module Dock0
30
31
  @config = configs.each_with_object(default_config) do |path, obj|
31
32
  new = YAML.load(File.read(path))
32
33
  next unless new
33
- obj.merge! new
34
+ obj.deep_merge! new
34
35
  end
35
36
  @paths = @config['paths']
36
37
  end
@@ -19,7 +19,7 @@ module Dock0
19
19
  end
20
20
 
21
21
  def build_url(artifact)
22
- org = @config['org']
22
+ org = artifact['org'] || @config['org']
23
23
  name, version, file = artifact.values_at('name', 'version', 'file')
24
24
  "https://github.com/#{org}/#{name}/releases/download/#{version}/#{file}"
25
25
  end
@@ -1,5 +1,5 @@
1
1
  ##
2
2
  # Set the version (needed for Mercenary -v)
3
3
  module Dock0
4
- VERSION = '0.2.9'
4
+ VERSION = '0.3.0'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dock0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.9
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Les Aker
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-17 00:00:00.000000000 Z
11
+ date: 2015-02-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mercenary
@@ -30,28 +30,42 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.0.1
33
+ version: 1.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.0.1
40
+ version: 1.0.0
41
+ - !ruby/object:Gem::Dependency
42
+ name: meld
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: 1.0.0
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 1.0.0
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: rubocop
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - "~>"
46
60
  - !ruby/object:Gem::Version
47
- version: 0.28.0
61
+ version: 0.29.0
48
62
  type: :development
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - "~>"
53
67
  - !ruby/object:Gem::Version
54
- version: 0.28.0
68
+ version: 0.29.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: rake
57
71
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 3.1.0
103
+ version: 3.2.0
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: 3.1.0
110
+ version: 3.2.0
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: fuubar
99
113
  requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
155
169
  version: '0'
156
170
  requirements: []
157
171
  rubyforge_project:
158
- rubygems_version: 2.2.2
172
+ rubygems_version: 2.4.5
159
173
  signing_key:
160
174
  specification_version: 4
161
175
  summary: Builds a read-only Arch host for Docker