vagrant-lxc 1.4.1 → 1.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/Gemfile +2 -2
- data/lib/vagrant-lxc/action/forward_ports.rb +4 -4
- data/lib/vagrant-lxc/version.rb +1 -1
- data/spec/unit/action/forward_ports_spec.rb +6 -6
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b214bb08c296b36a640e465653255ef125947255780e6c1a3f3f37e59cf58240
|
4
|
+
data.tar.gz: 8a0fd49b88445c090e9f75427cf096aeec1bf174fe61d424696550d3f079ff38
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 494cbee88612672f2fd209110c6f269185e82ffae9349354cf49e918aa7af21762f5e6985e712fead8a7713826863ba58ed47480769379786458de4b213d6af9
|
7
|
+
data.tar.gz: 11b3acdb633317d75c50f1526c6dde90b73a5ee8ac602c51f4bc6bc43be31e23aed0e19502a20df4860ad2d905b2c1db1463eab42753d449ebbd2af7d0b4cc8a
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
source 'https://rubygems.org'
|
2
2
|
|
3
3
|
group :development do
|
4
|
-
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: '
|
4
|
+
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.7'
|
5
5
|
gem 'guard'
|
6
6
|
gem 'guard-rspec'
|
7
7
|
gem 'rb-inotify'
|
@@ -12,7 +12,7 @@ group :development, :test do
|
|
12
12
|
gem 'rspec', '~> 2.99.0'
|
13
13
|
gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
|
14
14
|
# The is the ref *just* before we switch to childprocess 0.6, which conflicts with vagrant 1.8 deps.
|
15
|
-
|
15
|
+
gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0'
|
16
16
|
end
|
17
17
|
|
18
18
|
group :plugins do
|
@@ -81,8 +81,7 @@ module Vagrant
|
|
81
81
|
|
82
82
|
def redirect_port(host_ip, host_port, guest_ip, guest_port)
|
83
83
|
if redir_version >= 3
|
84
|
-
params = %W( :#{host_port} #{guest_ip}:#{guest_port} )
|
85
|
-
params[0] = "#{host_ip}:#{host_port}" if host_ip
|
84
|
+
params = %W( -n #{host_ip}:#{host_port} #{guest_ip}:#{guest_port} )
|
86
85
|
else
|
87
86
|
params = %W( --lport=#{host_port} --caddr=#{guest_ip} --cport=#{guest_port} )
|
88
87
|
params.unshift "--laddr=#{host_ip}" if host_ip
|
@@ -107,8 +106,9 @@ module Vagrant
|
|
107
106
|
end
|
108
107
|
|
109
108
|
def redir_version
|
110
|
-
|
111
|
-
|
109
|
+
stdout, stderr, _ = Open3.capture3 "redir --version"
|
110
|
+
# For some weird reason redir printed version information in STDERR prior to 3.2
|
111
|
+
version = stdout || stderr
|
112
112
|
version.split('.')[0].to_i
|
113
113
|
end
|
114
114
|
|
data/lib/vagrant-lxc/version.rb
CHANGED
@@ -35,7 +35,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
35
35
|
subject.stub(system: true)
|
36
36
|
subject.call(env)
|
37
37
|
expect(subject).to have_received(:spawn).with(
|
38
|
-
"redir #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
38
|
+
"redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
39
39
|
)
|
40
40
|
end
|
41
41
|
|
@@ -44,7 +44,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
44
44
|
subject.stub(system: true)
|
45
45
|
subject.call(env)
|
46
46
|
expect(subject).to have_received(:spawn).with(
|
47
|
-
"redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
47
|
+
"redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
48
48
|
)
|
49
49
|
end
|
50
50
|
|
@@ -53,7 +53,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
53
53
|
subject.stub(system: true)
|
54
54
|
subject.call(env)
|
55
55
|
expect(subject).to have_received(:spawn).with(
|
56
|
-
"redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
56
|
+
"redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
57
57
|
)
|
58
58
|
end
|
59
59
|
|
@@ -92,7 +92,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
92
92
|
subject.stub(system: true)
|
93
93
|
subject.call(env)
|
94
94
|
expect(subject).to have_received(:spawn).with(
|
95
|
-
"sudo redir #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
95
|
+
"sudo redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
96
96
|
)
|
97
97
|
end
|
98
98
|
|
@@ -101,7 +101,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
101
101
|
subject.stub(system: true)
|
102
102
|
subject.call(env)
|
103
103
|
expect(subject).to have_received(:spawn).with(
|
104
|
-
"sudo redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
104
|
+
"sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
105
105
|
)
|
106
106
|
end
|
107
107
|
|
@@ -110,7 +110,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
|
|
110
110
|
subject.stub(system: true)
|
111
111
|
subject.call(env)
|
112
112
|
expect(subject).to have_received(:spawn).with(
|
113
|
-
"sudo redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
113
|
+
"sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
|
114
114
|
)
|
115
115
|
end
|
116
116
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-lxc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
4
|
+
version: 1.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fabio Rehm
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-07-17 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: Linux Containers provider for Vagrant
|
14
14
|
email:
|
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
99
99
|
version: '0'
|
100
100
|
requirements: []
|
101
101
|
rubyforge_project:
|
102
|
-
rubygems_version: 2.7.
|
102
|
+
rubygems_version: 2.7.7
|
103
103
|
signing_key:
|
104
104
|
specification_version: 4
|
105
105
|
summary: Linux Containers provider for Vagrant
|