Skip to content

Commit

Permalink
Merge pull request #196 from codylane/master
Browse files Browse the repository at this point in the history
Address #172
  • Loading branch information
codylane authored Jul 23, 2019
2 parents 9fb3286 + 39b1531 commit c09c453
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# 2.0.2 / _NOT_RELEASED_YET
# 2.0.4 / NOT_YET_RELEASED

# 2.0.3 / 2019-07-23

This is a bug fix release to address systemd and docker issues.

Bug Fixes:
- https://github.com/tmatilai/vagrant-proxyconf/issues/172

# 2.0.2 / 2019-07-19

Expand Down
13 changes: 5 additions & 8 deletions lib/vagrant-proxyconf/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ def self.configure_after_provisoner
b.use Builtin::Call, IsEnabled do |env, b2|
# next if !env[:result]

# TODO: Do we really need to configure only specific proxies after the provisioner runs?
# Shouldn't they already be configured by this point?
# Cody Lane - Dec 2018
# b2.use ConfigureDockerProxy
# b2.use ConfigureGitProxy
# b2.use ConfigureNpmProxy
# b2.use ConfigurePearProxy
# b2.use ConfigureSvnProxy
b2.use ConfigureDockerProxy
b2.use ConfigureGitProxy
b2.use ConfigureNpmProxy
b2.use ConfigurePearProxy
b2.use ConfigureSvnProxy
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-proxyconf/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module ProxyConf
VERSION = '2.0.2'
VERSION = '2.0.3'
end
end
5 changes: 3 additions & 2 deletions test/issues/172/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ Vagrant.configure("2") do |config|

c.vm.provider "docker" do |d|
d.build_dir = "."
d.expose = ["#{$PROXY_PORT}"]
d.has_ssh = true
d.ports = ["#{$PROXY_PORT}", "#{$PROXY_PORT}"].join(':')
d.ports = [
"#{$PROXY_PORT}:#{$PROXY_PORT}",
]
end
end

Expand Down

0 comments on commit c09c453

Please sign in to comment.