vocker 0.2.0 → 0.2.1

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: 315ab3e764686000c69f9d0cb24bf5893fddad0f
4
- data.tar.gz: 402042dff0ed768ace0fc49032ed043e666e8393
3
+ metadata.gz: ce3c6c6b47fb223adc545bc3d9c712d3e77d0080
4
+ data.tar.gz: 6be0707de349afcb33c262d730a3a7082cc26ede
5
5
  SHA512:
6
- metadata.gz: c7136d70584226624f2b1e90748807dbee4a8af868d215b7afb3d04ba6ea7d35192c709a595b277d080c8848f380234eec872908db99e510fc6a2126200b1e42
7
- data.tar.gz: 42723e0cae99b1ae6026fd357d106a95ce8a1985fea5b950ed62bee437693cd580549ddb542910013a08bb418efa4cb3687be1ac2a2fafce09cd2527628264ca
6
+ metadata.gz: 47c119afb9e4be795f10e3879b5feb40948217f3f3c7104c64191dd2cb9a3728786b1baada1d5728c118b68884f7b0e6375520ef465dc93f15dd574fcace328c
7
+ data.tar.gz: b2fedef42a8d17ed5a4fed5391e2e77c00b328a1baaaa8f69a8407bf4a5377acebd0fc08e9318047fbeb118a375c3a681094d7a215e5d4df77b6dc350f209b65
data/CHANGELOG.md CHANGED
@@ -1,4 +1,8 @@
1
- ## [0.2.0](https://github.com/fgrehm/vocker/compare/v0.1.0...master) (unreleased)
1
+ ## [0.2.1](https://github.com/fgrehm/vocker/compare/v0.2.0...v0.2.1) (September 5, 2013)
2
+
3
+ - Configure Docker to automatically restart previously running containers on boot [GH-4]
4
+
5
+ ## [0.2.0](https://github.com/fgrehm/vocker/compare/v0.1.0...v0.2.0) (September 3, 2013)
2
6
 
3
7
  - Update installer for Docker 0.6 [GH-1]
4
8
 
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  GIT
2
2
  remote: git://github.com/mitchellh/vagrant.git
3
- revision: e34cdbf86dca4a02f528b52d02cc10ca1c7682c3
3
+ revision: a06742b8ef40b983d949bc9492a5a2a432530323
4
4
  specs:
5
- vagrant (1.2.8.dev)
5
+ vagrant (1.3.1.dev)
6
6
  childprocess (~> 0.3.7)
7
7
  erubis (~> 2.7.0)
8
8
  i18n (~> 0.6.0)
@@ -13,7 +13,7 @@ GIT
13
13
  PATH
14
14
  remote: .
15
15
  specs:
16
- vocker (0.2.0)
16
+ vocker (0.2.1)
17
17
 
18
18
  GEM
19
19
  remote: https://rubygems.org/
@@ -23,12 +23,12 @@ GEM
23
23
  childprocess (0.3.9)
24
24
  ffi (~> 1.0, >= 1.0.11)
25
25
  coderay (1.0.9)
26
- dependor (0.0.6)
26
+ dependor (1.0.1)
27
27
  diff-lcs (1.2.4)
28
28
  erubis (2.7.0)
29
29
  ffi (1.9.0)
30
30
  formatador (0.2.4)
31
- guard (1.8.1)
31
+ guard (1.8.2)
32
32
  formatador (>= 0.2.4)
33
33
  listen (>= 1.0.0)
34
34
  lumberjack (>= 1.0.2)
@@ -37,15 +37,15 @@ GEM
37
37
  guard-rspec (3.0.2)
38
38
  guard (>= 1.8)
39
39
  rspec (~> 2.13)
40
- i18n (0.6.4)
41
- listen (1.2.2)
40
+ i18n (0.6.5)
41
+ listen (1.3.0)
42
42
  rb-fsevent (>= 0.9.3)
43
43
  rb-inotify (>= 0.9)
44
44
  rb-kqueue (>= 0.2)
45
45
  log4r (1.1.10)
46
46
  lumberjack (1.0.4)
47
47
  method_source (0.8.2)
48
- multi_json (1.7.7)
48
+ multi_json (1.7.9)
49
49
  net-scp (1.1.2)
50
50
  net-ssh (>= 2.6.5)
51
51
  net-ssh (2.6.8)
@@ -55,7 +55,7 @@ GEM
55
55
  slop (~> 3.4)
56
56
  rake (10.1.0)
57
57
  rb-fsevent (0.9.3)
58
- rb-inotify (0.9.0)
58
+ rb-inotify (0.9.1)
59
59
  ffi (>= 0.5.0)
60
60
  rb-kqueue (0.2.0)
61
61
  ffi (>= 0.5.0)
@@ -63,8 +63,8 @@ GEM
63
63
  rspec-core (~> 2.14.0)
64
64
  rspec-expectations (~> 2.14.0)
65
65
  rspec-mocks (~> 2.14.0)
66
- rspec-core (2.14.4)
67
- rspec-expectations (2.14.1)
66
+ rspec-core (2.14.5)
67
+ rspec-expectations (2.14.2)
68
68
  diff-lcs (>= 1.1.3, < 2.0)
69
69
  rspec-mocks (2.14.3)
70
70
  simplecov (0.7.1)
@@ -73,8 +73,8 @@ GEM
73
73
  simplecov-html (0.7.1)
74
74
  slop (3.4.6)
75
75
  thor (0.18.1)
76
- vagrant-cachier (0.3.0)
77
- vagrant-global-status (0.1.0)
76
+ vagrant-cachier (0.3.2)
77
+ vagrant-global-status (0.1.1)
78
78
  vagrant-lxc (0.5.0)
79
79
  vagrant-pristine (0.2.0)
80
80
 
@@ -0,0 +1,13 @@
1
+ module VagrantPlugins
2
+ module Vocker
3
+ module Cap
4
+ module Debian
5
+ module DockerConfigureAutoStart
6
+ def self.docker_configure_auto_start(machine)
7
+ machine.communicate.sudo("sed -i.bak 's/docker -d/docker -d -r=true/' /etc/init/docker.conf ")
8
+ end
9
+ end
10
+ end
11
+ end
12
+ end
13
+ end
@@ -24,6 +24,10 @@ module VagrantPlugins
24
24
  raise Errors::DockerInstallFailed
25
25
  end
26
26
  end
27
+
28
+ if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.3.0')
29
+ @machine.guest.capability(:docker_configure_auto_start)
30
+ end
27
31
  end
28
32
  end
29
33
  end
data/lib/vocker/plugin.rb CHANGED
@@ -21,6 +21,11 @@ module VagrantPlugins
21
21
  Cap::Debian::DockerInstall
22
22
  end
23
23
 
24
+ guest_capability("debian", "docker_configure_auto_start") do
25
+ require_relative "cap/debian/docker_configure_auto_start"
26
+ Cap::Debian::DockerConfigureAutoStart
27
+ end
28
+
24
29
  guest_capability("linux", "docker_installed") do
25
30
  require_relative "cap/linux/docker_installed"
26
31
  Cap::Linux::DockerInstalled
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Vocker
3
- VERSION = "0.2.0"
3
+ VERSION = "0.2.1"
4
4
  end
5
5
  end
@@ -43,6 +43,7 @@ describe VagrantPlugins::Vocker::DockerInstaller do
43
43
 
44
44
  expect(guest).to have_received.capability(:docker_installed)
45
45
  expect(guest).to have_received.capability(:docker_install)
46
+ expect(guest).to have_received.capability(:docker_configure_auto_start)
46
47
  end
47
48
 
48
49
  it 'errors out if docker could not be installed' do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vocker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fabio Rehm
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-03 00:00:00.000000000 Z
11
+ date: 2013-09-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -57,6 +57,7 @@ files:
57
57
  - Rakefile
58
58
  - development/Vagrantfile
59
59
  - lib/vocker.rb
60
+ - lib/vocker/cap/debian/docker_configure_auto_start.rb
60
61
  - lib/vocker/cap/debian/docker_install.rb
61
62
  - lib/vocker/cap/linux/docker_installed.rb
62
63
  - lib/vocker/command.rb
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
95
96
  version: '0'
96
97
  requirements: []
97
98
  rubyforge_project:
98
- rubygems_version: 2.0.0
99
+ rubygems_version: 2.0.7
99
100
  signing_key:
100
101
  specification_version: 4
101
102
  summary: Introduces Docker to Vagrant