vocker 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +11 -0
- data/Gemfile +1 -1
- data/Gemfile.lock +3 -4
- data/README.md +10 -2
- data/lib/vocker/cap/debian/docker_install.rb +1 -1
- data/lib/vocker/docker_client.rb +14 -2
- data/lib/vocker/version.rb +1 -1
- data/spec/unit/docker_client_spec.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: eaf5ac0735450fedcd7c62184b010a7ce9fd5eb5
|
4
|
+
data.tar.gz: 60bb3abc9bf4383eefd53998531d649f229affdc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8d853bb3ea5a0042a9f7957060f1e8e071343992cdb6f53723634c638c8638e8fea4d40fd3fb8b66ba01fb9c2865deed803b4a07176a7b796c657bd16d43ee52
|
7
|
+
data.tar.gz: b5454b97d98f84826717b1d8074b9627a4b0ec74e3a1ca763b046baa9ba281892fffbcaf22a4ae9c0abe94a1213b0babbac216905e69ae1b8901ac77ca444e3c
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,14 @@
|
|
1
|
+
## [0.4.1](https://github.com/fgrehm/vocker/compare/v0.4.0...v0.4.1) (December 13, 2013)
|
2
|
+
|
3
|
+
IMPROVEMENTS:
|
4
|
+
|
5
|
+
- Make use of `https` when downloading Docker's gpg key [GH-19]
|
6
|
+
|
7
|
+
BUG FIXES:
|
8
|
+
|
9
|
+
- Check for whether containers exists / are running now work across
|
10
|
+
multiple Docker versions [GH-20]
|
11
|
+
|
1
12
|
## [0.4.0](https://github.com/fgrehm/vocker/compare/v0.3.3...v0.4.0) (November 8, 2013)
|
2
13
|
|
3
14
|
IMPROVEMENTS:
|
data/Gemfile
CHANGED
@@ -6,7 +6,7 @@ gemspec
|
|
6
6
|
group :development do
|
7
7
|
gem 'vagrant', github: 'mitchellh/vagrant'
|
8
8
|
gem 'vagrant-lxc', github:'fgrehm/vagrant-lxc'
|
9
|
-
gem 'vagrant-cachier', github:'fgrehm/vagrant-cachier'
|
9
|
+
gem 'vagrant-cachier', github:'fgrehm/vagrant-cachier'
|
10
10
|
gem 'vagrant-pristine', github:'fgrehm/vagrant-pristine'
|
11
11
|
gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
|
12
12
|
|
data/Gemfile.lock
CHANGED
@@ -1,9 +1,8 @@
|
|
1
1
|
GIT
|
2
2
|
remote: git://github.com/fgrehm/vagrant-cachier.git
|
3
|
-
revision:
|
4
|
-
branch: release-0.5.0
|
3
|
+
revision: 354c9ca2b553e212db0f004103bc2c3b32d74a57
|
5
4
|
specs:
|
6
|
-
vagrant-cachier (0.5.
|
5
|
+
vagrant-cachier (0.5.1.dev)
|
7
6
|
|
8
7
|
GIT
|
9
8
|
remote: git://github.com/fgrehm/vagrant-global-status.git
|
@@ -38,7 +37,7 @@ GIT
|
|
38
37
|
PATH
|
39
38
|
remote: .
|
40
39
|
specs:
|
41
|
-
vocker (0.4.
|
40
|
+
vocker (0.4.1)
|
42
41
|
|
43
42
|
GEM
|
44
43
|
remote: https://rubygems.org/
|
data/README.md
CHANGED
@@ -1,11 +1,17 @@
|
|
1
1
|
# Vocker
|
2
2
|
|
3
|
-
|
3
|
+
A plugin that introduces [Docker](http://docker.io) to [Vagrant](http://www.vagrantup.com/)
|
4
4
|
as a [provisioner](http://docs.vagrantup.com/v2/plugins/provisioners.html) and
|
5
5
|
as a command that allows you to interact with the guest machine Docker
|
6
6
|
installation. It can also be used for building other Vagrant plugins that
|
7
7
|
needs interaction with a Docker instance.
|
8
8
|
|
9
|
+
## DEPRECATION NOTICE
|
10
|
+
|
11
|
+
The plugin has been merged back into Vagrant core and will be deprecated once Vagrant
|
12
|
+
1.4 is out. I'll ship just one more version with the updates to align with the
|
13
|
+
changes introduced on the corresponding [pull request](https://github.com/mitchellh/vagrant/pull/2549).
|
14
|
+
|
9
15
|
|
10
16
|
## Installation
|
11
17
|
|
@@ -108,7 +114,7 @@ without leaving lots of unused containers behind. If you are interested on
|
|
108
114
|
understanding how it works, have a look at [_DockerClient#run_](https://github.com/fgrehm/vocker/blob/master/lib/vocker/docker_client.rb#L22)
|
109
115
|
|
110
116
|
|
111
|
-
### `vagrant docker` command
|
117
|
+
### `vagrant docker` command (DEPRECATED)
|
112
118
|
|
113
119
|
The command is basically a wrapper over `vagrant ssh -c` that allows you
|
114
120
|
to run `docker` commands on the guest VM:
|
@@ -123,6 +129,8 @@ pull, push, restart, rm, rmi, run, search, start, stop, tag, version, wait
|
|
123
129
|
-h, --help Print this help
|
124
130
|
```
|
125
131
|
|
132
|
+
_Please note that the support for the command will be dropped on the next version of the plugin_
|
133
|
+
|
126
134
|
|
127
135
|
### _your-awesome-vagrant-plugin™_
|
128
136
|
|
@@ -13,7 +13,7 @@ module VagrantPlugins
|
|
13
13
|
comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`")
|
14
14
|
end
|
15
15
|
comm.sudo("apt-get install -y --force-yes -q curl")
|
16
|
-
comm.sudo("curl
|
16
|
+
comm.sudo("curl https://get.docker.io/gpg | apt-key add -")
|
17
17
|
comm.sudo("echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
|
18
18
|
comm.sudo("apt-get update")
|
19
19
|
comm.sudo("apt-get install -y --force-yes -q xz-utils #{package} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'")
|
data/lib/vocker/docker_client.rb
CHANGED
@@ -48,7 +48,7 @@ module VagrantPlugins
|
|
48
48
|
end
|
49
49
|
|
50
50
|
def container_exist?(id)
|
51
|
-
|
51
|
+
lookup_container(id, true)
|
52
52
|
end
|
53
53
|
|
54
54
|
def start_container(id)
|
@@ -58,7 +58,7 @@ module VagrantPlugins
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def container_running?(id)
|
61
|
-
|
61
|
+
lookup_container(id)
|
62
62
|
end
|
63
63
|
|
64
64
|
def create_container(config)
|
@@ -97,6 +97,18 @@ module VagrantPlugins
|
|
97
97
|
|
98
98
|
args.compact.flatten.join ' '
|
99
99
|
end
|
100
|
+
|
101
|
+
def lookup_container(id, list_all = false)
|
102
|
+
docker_ps = "sudo docker ps -q"
|
103
|
+
docker_ps << " -a" if list_all
|
104
|
+
@machine.communicate.tap do |comm|
|
105
|
+
# Docker < 0.7.0 stores container IDs using its short version while
|
106
|
+
# recent versions use the full container ID
|
107
|
+
# See https://github.com/dotcloud/docker/pull/2140 for more information
|
108
|
+
return comm.test("#{docker_ps} | grep -wFq #{id}") ||
|
109
|
+
comm.test("#{docker_ps} -notrunc | grep -wFq #{id}")
|
110
|
+
end
|
111
|
+
end
|
100
112
|
end
|
101
113
|
end
|
102
114
|
end
|
data/lib/vocker/version.rb
CHANGED
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.4.
|
4
|
+
version: 0.4.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-
|
11
|
+
date: 2013-12-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|