vagrant-proxyconf 2.0.8 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d721ed3ca409df6422674ace6fe21eb4d061f2803ab1e3d3297f2a6443ca06b
-  data.tar.gz: ba5327b55dbda01b797803002c990b96a9905897ec9fa933f38dac8c9fd00341
+  metadata.gz: 6d2ed9c11cdc9cd9649a6dab1f4916430deffd34d7beef9f60ec1d997d8248ba
+  data.tar.gz: 44b631d6aee2ad96dcb2acceb25ac5eb11ec948830d8003f24be2182f047ea83
 SHA512:
-  metadata.gz: d4be0de47b43ad064279e9820e22de28a3ac55436635eb655dea3e407df08c71900569a565df930d090e4ebe8a887542feeeb4f1018881aae6e0166179882bb1
-  data.tar.gz: e259b6a96d86aca4fdebca70a029c918c574801569aee4acee0299908d7f2f34633627561e4b35d13f5b4af16e3d45c34025683523808dedcc09988bd827d881
+  metadata.gz: 76a5f3c7cd26ea510166d5757f3aa30f09befda31820fd0f1af02ff339964148314fcd8d686bf11cb8ee99b7ab4a49b2b7f7e1adde062766b9006e655f0130f0
+  data.tar.gz: c9e333a2a6f9306e71d0e7d2f5e2ef196cb4d8adde2864cb4d5bc8da54df348fddc21899291d176a7e28bb184094453da6759f4252e672b412dd9c7eac659a21

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-# 2.0.9 / not yet released
+# 2.0.10 / 2020-07-03
+
+This is a bug fix release when provisioning docker hosts inside of
+vagrant. This version removes the hard coded DOCKER_CONFIG environment
+variable in /etc/environment and hard codes the client config to
+/home/vagrant/.docker/config.json. This is a temporary work around until
+the this can be refactored.
+
+Existing values in /home/vagrant/.docker/config.json should be preserved
+and merged when the vagrant-proxy conf is being provisioned.
+
+#### Closed Issues
+
+- [Respect Existing Docker Config Location #218](https://github.com/tmatilai/vagrant-proxyconf/issues/218)
+
+
+# 2.0.9 / Not released
+
+A release tagging error caused this release to become a draft release
+and this will be re-released as 2.0.10.
+
 
 # 2.0.8 / 2020-06-10
 
@@ -6,6 +26,8 @@ This is a bug fix release for windows users which fixes a bug with the
 tempfile creation when uploading and downloading files from the vagrant
 machine.
 
+
+
 #### Closed Issues
 
 - [tempfile implementation on windows doesn't always seem to work

data/lib/vagrant-proxyconf/action/configure_docker_proxy.rb

@@ -46,11 +46,11 @@ module VagrantPlugins
           @docker_client_config = tempfile(Hash.new)
 
           @machine.communicate.tap do |comm|
-            if comm.test("[ -f /etc/docker/config.json ]")
-              logger.info('Downloading file /etc/docker/config.json')
-              comm.sudo("chmod 0644 /etc/docker/config.json")
-              comm.download("/etc/docker/config.json", @docker_client_config.path)
-              logger.info("Downloaded /etc/docker/config.json to #{@docker_client_config.path}")
+            if comm.test("[ -f /home/vagrant/.docker/config.json ]")
+              logger.info('Downloading file /home/vagrant/.docker/config.json')
+              comm.sudo("chmod 0644 /home/vagrant/.docker/config.json")
+              comm.download("/home/vagrant/.docker/config.json", @docker_client_config.path)
+              logger.info("Downloaded /home/vagrant/.docker/config.json to #{@docker_client_config.path}")
             end
           end
 
@@ -96,11 +96,10 @@ module VagrantPlugins
 
           @machine.communicate.tap do |comm|
             comm.upload(@docker_client_config.path, "/tmp/vagrant-proxyconf-docker-config.json")
-            comm.sudo("mkdir -p /etc/docker")
-            comm.sudo("chown root:docker /etc/docker")
-            comm.sudo("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
-            comm.sudo("chown root:docker /etc/docker/config.json")
-            comm.sudo("chmod 0644 /etc/docker/config.json")
+            comm.sudo("mkdir -p /home/vagrant/.docker")
+            comm.sudo("mv /tmp/vagrant-proxyconf-docker-config.json /home/vagrant/.docker/config.json")
+            comm.sudo("chown -R vagrant:docker /home/vagrant/.docker")
+            comm.sudo("chmod 0644 /home/vagrant/.docker/config.json")
             comm.sudo("rm -f /tmp/vagrant-proxyconf-docker-config.json")
 
             comm.sudo("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '2.0.8'
+    VERSION = '2.0.10'
   end
 end

data/spec/unit/vagrant-proxyconf/action/configure_docker_proxy_spec.rb

@@ -18,14 +18,13 @@ end
 
 def mock_update_docker_client_config(machine)
   allow(machine).to receive_message_chain(:communicate, :upload)
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/docker/config.json")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/docker/config.json")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /home/vagrant/.docker")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mv /tmp/vagrant-proxyconf-docker-config.json /home/vagrant/.docker/config.json")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown -R vagrant:docker /home/vagrant/.docker")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /home/vagrant/.docker/config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf-docker-config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("echo DOCKER_CONFIG=/etc/docker >> /etc/environment")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/docker")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/docker")
 end
 
 def mock_update_docker_systemd_config(machine)
@@ -73,8 +72,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         docker_proxy.instance_variable_set(:@machine, machine)
 
         # #docker_client_config mock
-        fixture = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-        docker_proxy.instance_variable_set(:@docker_client_config, fixture)
+        fixture = fixture = docker_proxy.send(:tempfile, load_fixture(fixture))
+        docker_proxy.instance_variable_set(:@docker_client_config, fixture.path)
 
         # #supported? mock
         allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
@@ -101,7 +100,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         @docker_proxy = docker_proxy
       end
 
-      context 'and when /etc/docker/config.json has proxy configuration' do
+      context 'and when /home/vagrant/.docker/config.json has proxy configuration' do
         before :each do
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           configure_docker_proxy(fixture)
@@ -110,7 +109,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           )
         end
 
-        it 'update /etc/docker/config.json' do
+        it 'update /home/vagrant/.docker/config.json' do
             expect(@docker_proxy.send(:configure_machine)).to eq true
         end
       end
@@ -125,8 +124,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           docker_proxy.instance_variable_set(:@machine, machine)
 
           # #docker_client_config mock
-          fixture = docker_proxy.send(:tempfile, load_fixture(fixture)).path
-          docker_proxy.instance_variable_set(:@docker_client_config, fixture)
+          fixture = docker_proxy.send(:tempfile, load_fixture(fixture))
+          docker_proxy.instance_variable_set(:@docker_client_config, fixture.path)
 
           # #supported? mock
           allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
@@ -204,7 +203,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
     end
 
     context "when supported" do
-      context "when /etc/docker/config.json exists" do
+      context "when /home/vagrant/.docker/config.json exists" do
         subject do
           docker_proxy = described_class.new(nil, nil)
           docker_proxy.instance_variable_set(:@machine, machine)
@@ -212,8 +211,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
 
-          allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /etc/docker/config.json ]").and_return(true)
-          allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/docker/config.json")
+          allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /home/vagrant/.docker/config.json ]").and_return(true)
+          allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /home/vagrant/.docker/config.json")
           allow(machine).to receive_message_chain(:communicate, :download)
 
           docker_proxy.send(:docker_client_config)
@@ -222,7 +221,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         it { expect(File.exists?(subject.path)).to eq true }
       end
 
-      context "when /etc/docker/config.json does not exist" do
+      context "when /home/vagrant/.docker/config.json does not exist" do
         subject do
           docker_proxy = described_class.new(nil, nil)
           docker_proxy.instance_variable_set(:@machine, machine)
@@ -230,7 +229,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
 
-          allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /etc/docker/config.json ]").and_return(false)
+          allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /home/vagrant/.docker/config.json ]").and_return(false)
 
           docker_proxy.send(:docker_client_config)
         end
@@ -282,7 +281,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
       end
     end
 
-    context "when /etc/docker/config.json is supported" do
+    context "when /home/vagrant/.docker/config.json is supported" do
 
       context "when configuration is disabled" do
         it do
@@ -292,7 +291,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           # mock a result that looks like proxy is configured for the config.json
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           fixture_content = load_fixture(fixture)
-          config_path = docker_proxy.send(:tempfile, fixture_content).path
+
+          temp_filename = config_path = docker_proxy.send(:tempfile, fixture_content)
+          config_path = temp_filename.path
 
           docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
@@ -331,7 +332,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           # mock a result that looks like no proxy is configured for the config.json
           fixture = fixture_file("docker_client_config_json_no_proxy")
           fixture_content = load_fixture(fixture)
-          config_path = docker_proxy.send(:tempfile, fixture_content).path
+          temp_filename = config_path = docker_proxy.send(:tempfile, fixture_content)
+          config_path = temp_filename.path
 
           docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
@@ -391,7 +393,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           docker_proxy.instance_variable_set(:@version, [18, 9, 0])
 
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
-          config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
+          temp_filename = config_path = docker_proxy.send(:tempfile, load_fixture(fixture))
+          config_path = temp_filename.path
+
           docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           # to isolate this test, we turn of support for systemd
@@ -440,7 +444,8 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(docker_proxy).to receive(:supports_systemd?).and_return(false)
 
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
-          config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
+          temp_filename = docker_proxy.send(:tempfile, load_fixture(fixture))
+          config_path = temp_filename.path
           docker_proxy.instance_variable_set(:@docker_client_config, config_path)
 
           allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)

data/test/issues/218/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/test/issues/218/Dockerfile

@@ -0,0 +1,47 @@
+FROM centos:7
+
+ENV CI_USERNAME vagrant
+ENV CI_PASSWORD vagrant
+ENV CI_HOMEDIR  /home/vagrant
+ENV CI_SHELL    /bin/bash
+
+EXPOSE 8888
+
+RUN yum clean all && \
+    yum makecache fast && \
+    yum -y install epel-release && \
+    yum clean expire-cache && \
+    yum -y install \
+      curl \
+      initscripts \
+      openssh-clients \
+      openssh-server \
+      sudo \
+      tinyproxy
+
+RUN /usr/sbin/sshd-keygen && \
+    mkdir -p /var/run/sshd && \
+    rm -f /usr/lib/tmpfiles.d/systemd-nologin.conf
+
+RUN if ! getent passwd $CI_USERNAME; then \
+      useradd -m -d ${CI_HOMEDIR} -s ${CI_SHELL} $CI_USERNAME; \
+    fi && \
+    echo "${CI_USERNAME}:${CI_PASSWORD}" | chpasswd && \
+    echo "${CI_USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
+    mkdir -p /etc/sudoers.d && \
+    echo "${CI_USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/${CI_USERNAME} && \
+    chmod 0440 /etc/sudoers.d/${CI_USERNAME} && \
+    mkdir -p ${CI_HOMEDIR}/.ssh && \
+    chown -R ${CI_USERNAME}:${CI_USERNAME} ${CI_HOMEDIR}/.ssh && \
+    chmod 0700 ${CI_HOMEDIR}/.ssh && \
+    curl -L https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub > ${CI_HOMEDIR}/.ssh/vagrant.pub && \
+    touch ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    grep -q "$(cat ${CI_HOMEDIR}/.ssh/vagrant.pub | awk '{print $2}')" ${CI_HOMEDIR}/.ssh/authorized_keys || cat ${CI_HOMEDIR}/.ssh/vagrant.pub >> ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    chown ${CI_USERNAME}:${CI_USERNAME} ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    chmod 0600 ${CI_HOMEDIR}/.ssh/authorized_keys
+
+COPY tinyproxy.conf /etc/tinyproxy/tinyproxy.conf
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD [ "start" ]

data/test/issues/218/README.md

@@ -0,0 +1,35 @@
+Tests
+-----
+
+
+Lined to github issue [#218](https://github.com/tmatilai/vagrant-proxyconf/issues/218)
+
+
+If you are testing the current release of this plugin via bundler
+
+```
+bundle exec vagrant up default
+```
+
+## Expect
+
+
+### Box `default``
+
+  - The box `default` is a docker container that will be a reverse
+    proxy. It should provision itself and work without errors.
+
+  - You can check that the proxy is working by
+    `tail -f /var/log/tinyproxy/tinyproxy.log` inside the container
+
+  - **NOTE**: You'll need to use `docker exec <hash> -it bash` to get into the container
+
+
+### Box `docker-host`
+
+  - Vagrant should automatically instally docker-ce.
+  - The box should come up and provision itself with the proxy settings
+    configured in your Vagrantfile.
+
+
+  - **NOTE**: You can use `ssh` to connect to this container.

data/test/issues/218/Rakefile

@@ -0,0 +1,27 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :spec    => 'spec:all'
+task :default => :spec
+
+namespace :spec do
+  targets = []
+  Dir.glob('./spec/*').each do |dir|
+    next unless File.directory?(dir)
+    target = File.basename(dir)
+    target = "_#{target}" if target == "default"
+    targets << target
+  end
+
+  task :all     => targets
+  task :default => :all
+
+  targets.each do |target|
+    original_target = target == "_default" ? target[1..-1] : target
+    desc "Run serverspec tests to #{original_target}"
+    RSpec::Core::RakeTask.new(target.to_sym) do |t|
+      ENV['TARGET_HOST'] = original_target
+      t.pattern = "spec/#{original_target}/*_spec.rb"
+    end
+  end
+end

data/test/issues/218/Vagrantfile

@@ -0,0 +1,62 @@
+# this should be the IP address of the :default box
+$PROXY_HOST ="10.0.2.2"
+$PROXY_PORT="8888"
+$PROXY_NO_PROXY=[
+  'localhost',
+]
+
+ENV['HTTP_PROXY']  = ENV.fetch('HTTP_PROXY',  "http://#{$PROXY_HOST}:#{$PROXY_PORT}")
+ENV['HTTPS_PROXY'] = ENV.fetch('HTTPS_PROXY', "http://#{$PROXY_HOST}:#{$PROXY_PORT}")
+ENV['NO_PROXY']    = ENV.fetch('NO_PROXY',    $PROXY_NO_PROXY.join(","))
+
+puts "HTTP_PROXY  = '#{ENV["HTTP_PROXY"]}'"
+puts "HTTPS_PROXY = '#{ENV["HTTPS_PROXY"]}'"
+puts "NO_PROXY    = '#{ENV["NO_PROXY"]}'"
+
+puts "is vagrant-proxyconf installed? #{Vagrant.has_plugin?('vagrant-proxyconf')}"
+
+Vagrant.configure("2") do |config|
+
+  config.vm.define 'default' do |c|
+    c.vm.box = nil
+
+    if Vagrant.has_plugin?('vagrant-proxyconf')
+      c.proxy.enabled = false
+    end
+
+    c.vm.provider "docker" do |d|
+      d.build_dir = "."
+      d.expose = ['8888']
+      d.has_ssh = true
+      d.ports = ['8888:8888']
+    end
+  end
+
+  config.vm.define 'docker_host' do |c|
+    c.vm.box = "centos/7"
+    c.vm.box_check_update = false
+
+    if Vagrant.has_plugin?('vagrant-proxyconf')
+      c.proxy.http     = ENV['HTTP_PROXY']
+      c.proxy.https    = ENV['HTTPS_PROXY']
+      c.proxy.no_proxy = ENV['NO_PROXY']
+    end
+
+    c.vm.provision "shell", path: "force-all-outbound-traffic-through-proxy.iptables"
+
+    if Vagrant.has_plugin?('vagrant-vbguest')
+      c.vbguest.auto_update = false
+      c.vbguest.auto_reboot = true
+    end
+
+    c.vm.provision "docker"
+
+    c.vm.synced_folder ".", "/vagrant",
+      disabled: false,
+      type: "sshfs",
+      ssh_opts_append: "-o Compression=yes -o ControlPersist=60s -o ControlMaster=auto",
+      sshfs_opts_append: "-o cache=no -o nonempty"
+
+  end
+
+end

data/test/issues/218/entrypoint.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -ex
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+start() {
+  # start ssh if sshd is installed
+  if [ -f /usr/sbin/sshd ]; then
+
+    /usr/sbin/sshd-keygen
+    /usr/sbin/sshd -t
+    /usr/sbin/sshd
+
+  else
+
+    true
+
+  fi
+
+  # start tinyproxy
+  /usr/sbin/tinyproxy \
+    -d \
+    -c "/etc/tinyproxy/tinyproxy.conf"
+}
+
+stop() {
+
+  pgrep -f 'sshd' | while read _pid
+  do
+    kill -9 $_pid
+  done
+
+  pgrep -f 'tinyproxy' | while read _pid
+  do
+    kill -9 $_pid
+  done
+
+}
+
+case "${1}" in
+
+  start)
+    start
+    ;;
+
+  stop)
+    stop
+    ;;
+
+esac

data/test/issues/218/force-all-outbound-traffic-through-proxy.iptables

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+
+# OUTPUT:IN= OUT=eth0 SRC=10.0.2.15 DST=10.0.2.2 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=61920 DF PROTO=TCP SPT=59780 DPT=8888 WINDOW=65535 RES=0x00 ACK URGP=0
+# OUTPUT:IN= OUT=eth0 SRC=10.0.2.15 DST=10.0.2.2 LEN=84 TOS=0x10 PREC=0x00 TTL=64 ID=22073 DF PROTO=TCP SPT=22 DPT=55694 WINDOW=47600 RES=0x00 ACK PSH URGP=0
+# OUTPUT:IN= OUT=eth0 SRC=10.0.2.15 DST=10.0.2.3 LEN=60 TOS=0x00 PREC=0x00 TTL=64 ID=30731 PROTO=UDP SPT=45910 DPT=53 LEN=40
+
+iptables -F OUTPUT
+iptables -Z OUTPUT
+
+iptables -A OUTPUT -d 10.0.2.2 -p tcp -m tcp --dport 8888 -j ACCEPT
+iptables -A OUTPUT -p tcp -m tcp --sport 22 -j ACCEPT
+iptables -A OUTPUT -p udp -m udp --dport 53 -j ACCEPT
+iptables -A OUTPUT -p udp -m udp --dport 123 -j ACCEPT
+
+iptables -A OUTPUT -j LOG --log-prefix 'OUTPUT:DROPPED '
+
+iptables -P OUTPUT DROP

data/test/issues/218/spec/default/redhat_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe package('tinyproxy') do
+  it { should be_installed }
+end
+
+describe service('tinyproxy') do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+
+describe port(8888) do
+  it { should be_listening }
+  it { should be_listening.on('0.0.0.0').with('tcp') }
+end

data/test/issues/218/spec/docker_host/redhat_spec.rb

@@ -0,0 +1,171 @@
+require 'spec_helper'
+
+PROXY_HOST = "10.0.2.2"
+
+describe service('docker') do
+  it { should be_running }
+  it { should be_enabled  }
+end
+
+
+describe file('/etc/docker/config.json') do
+  it { should_not be_file }
+  it { should_not exist }
+end
+
+
+describe file('/home/vagrant/.docker/config.json') do
+  it { should be_file }
+  it { should exist }
+  it { should be_mode 644 }
+  it { should be_owned_by "vagrant" }
+  it { should be_grouped_into "docker" }
+end
+
+context 'when proxy is enabled' do
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = "http://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/home/vagrant/.docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpProxy"  => "http://10.0.2.2:8888",
+            "httpsProxy" => "http://10.0.2.2:8888",
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+end
+
+context 'when HTTP_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = ""
+    ENV['HTTPS_PROXY'] = "https://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/home/vagrant/.docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpsProxy" => "https://#{PROXY_HOST}:8888",
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+end
+
+context 'when HTTPS_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = ""
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+  end
+
+  describe file('/home/vagrant/.docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpProxy"  => "http://#{PROXY_HOST}:8888",
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+end
+
+context 'when HTTPS_PROXY="" and HTTP_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = ""
+    ENV['HTTPS_PROXY'] = ""
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/home/vagrant/.docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+end
+
+context 'when NO_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = "https://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = ""
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/home/vagrant/.docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+             "httpProxy" => "http://#{PROXY_HOST}:8888",
+             "httpsProxy" => "https://#{PROXY_HOST}:8888",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+end

data/test/issues/218/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+require 'serverspec'
+require 'net/ssh'
+require 'tempfile'
+
+set :backend, :ssh
+
+if ENV['ASK_SUDO_PASSWORD']
+  begin
+    require 'highline/import'
+  rescue LoadError
+    fail "highline is not available. Try installing it."
+  end
+  set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
+else
+  set :sudo_password, ENV['SUDO_PASSWORD'] || "vagrant"
+end
+
+host = ENV['TARGET_HOST']
+
+`vagrant up #{host}`
+
+config = Tempfile.new('', Dir.tmpdir)
+config.write(`vagrant ssh-config #{host}`)
+config.close
+
+options = Net::SSH::Config.for(host, [config.path])
+
+options[:user] ||= Etc.getlogin
+
+set :host,        options[:host_name] || host
+set :ssh_options, options
+
+# Disable sudo
+# set :disable_sudo, true
+
+
+# Set environment variables
+set :env,
+      :LANG => 'C',
+      :LC_MESSAGES => 'C'
+
+# Set PATH
+# set :path, '/sbin:/usr/local/sbin:$PATH'

data/test/issues/218/tinyproxy.conf

@@ -0,0 +1,333 @@
+##
+## tinyproxy.conf -- tinyproxy daemon configuration file
+##
+## This example tinyproxy.conf file contains example settings
+## with explanations in comments. For decriptions of all
+## parameters, see the tinproxy.conf(5) manual page.
+##
+
+#
+# User/Group: This allows you to set the user and group that will be
+# used for tinyproxy after the initial binding to the port has been done
+# as the root user. Either the user or group name or the UID or GID
+# number may be used.
+#
+User tinyproxy
+Group tinyproxy
+
+#
+# Port: Specify the port which tinyproxy will listen on.  Please note
+# that should you choose to run on a port lower than 1024 you will need
+# to start tinyproxy using root.
+#
+Port 8888
+
+#
+# Listen: If you have multiple interfaces this allows you to bind to
+# only one. If this is commented out, tinyproxy will bind to all
+# interfaces present.
+#
+#Listen 192.168.0.1
+
+#
+# Bind: This allows you to specify which interface will be used for
+# outgoing connections.  This is useful for multi-home'd machines where
+# you want all traffic to appear outgoing from one particular interface.
+#
+#Bind 192.168.0.1
+
+#
+# BindSame: If enabled, tinyproxy will bind the outgoing connection to the
+# ip address of the incoming connection.
+#
+#BindSame yes
+
+#
+# Timeout: The maximum number of seconds of inactivity a connection is
+# allowed to have before it is closed by tinyproxy.
+#
+Timeout 600
+
+#
+# ErrorFile: Defines the HTML file to send when a given HTTP error
+# occurs.  You will probably need to customize the location to your
+# particular install.  The usual locations to check are:
+#   /usr/local/share/tinyproxy
+#   /usr/share/tinyproxy
+#   /etc/tinyproxy
+#
+#ErrorFile 404 "/usr/share/tinyproxy/404.html"
+#ErrorFile 400 "/usr/share/tinyproxy/400.html"
+#ErrorFile 503 "/usr/share/tinyproxy/503.html"
+#ErrorFile 403 "/usr/share/tinyproxy/403.html"
+#ErrorFile 408 "/usr/share/tinyproxy/408.html"
+
+#
+# DefaultErrorFile: The HTML file that gets sent if there is no
+# HTML file defined with an ErrorFile keyword for the HTTP error
+# that has occured.
+#
+DefaultErrorFile "/usr/share/tinyproxy/default.html"
+
+#
+# StatHost: This configures the host name or IP address that is treated
+# as the stat host: Whenever a request for this host is received,
+# Tinyproxy will return an internal statistics page instead of
+# forwarding the request to that host.  The default value of StatHost is
+# tinyproxy.stats.
+#
+#StatHost "tinyproxy.stats"
+#
+
+#
+# StatFile: The HTML file that gets sent when a request is made
+# for the stathost.  If this file doesn't exist a basic page is
+# hardcoded in tinyproxy.
+#
+StatFile "/usr/share/tinyproxy/stats.html"
+
+#
+# LogFile: Allows you to specify the location where information should
+# be logged to.  If you would prefer to log to syslog, then disable this
+# and enable the Syslog directive.  These directives are mutually
+# exclusive.
+#
+LogFile "/var/log/tinyproxy/tinyproxy.log"
+
+#
+# Syslog: Tell tinyproxy to use syslog instead of a logfile.  This
+# option must not be enabled if the Logfile directive is being used.
+# These two directives are mutually exclusive.
+#
+#Syslog On
+
+#
+# LogLevel: 
+#
+# Set the logging level. Allowed settings are:
+#	Critical	(least verbose)
+#	Error
+#	Warning
+#	Notice
+#	Connect		(to log connections without Info's noise)
+#	Info		(most verbose)
+#
+# The LogLevel logs from the set level and above. For example, if the
+# LogLevel was set to Warning, then all log messages from Warning to
+# Critical would be output, but Notice and below would be suppressed.
+#
+LogLevel Info
+
+#
+# PidFile: Write the PID of the main tinyproxy thread to this file so it
+# can be used for signalling purposes.
+#
+PidFile "/var/run/tinyproxy/tinyproxy.pid"
+
+#
+# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
+# contains the client's IP address.
+#
+#XTinyproxy Yes
+
+#
+# Upstream:
+#
+# Turns on upstream proxy support.
+#
+# The upstream rules allow you to selectively route upstream connections
+# based on the host/domain of the site being accessed.
+#
+# For example:
+#  # connection to test domain goes through testproxy
+#  upstream testproxy:8008 ".test.domain.invalid"
+#  upstream testproxy:8008 ".our_testbed.example.com"
+#  upstream testproxy:8008 "192.168.128.0/255.255.254.0"
+#
+#  # no upstream proxy for internal websites and unqualified hosts
+#  no upstream ".internal.example.com"
+#  no upstream "www.example.com"
+#  no upstream "10.0.0.0/8"
+#  no upstream "192.168.0.0/255.255.254.0"
+#  no upstream "."
+#
+#  # connection to these boxes go through their DMZ firewalls
+#  upstream cust1_firewall:8008 "testbed_for_cust1"
+#  upstream cust2_firewall:8008 "testbed_for_cust2"
+#
+#  # default upstream is internet firewall
+#  upstream firewall.internal.example.com:80
+#
+# The LAST matching rule wins the route decision.  As you can see, you
+# can use a host, or a domain:
+#  name     matches host exactly
+#  .name    matches any host in domain "name"
+#  .        matches any host with no domain (in 'empty' domain)
+#  IP/bits  matches network/mask
+#  IP/mask  matches network/mask
+#
+#Upstream some.remote.proxy:port
+
+#
+# MaxClients: This is the absolute highest number of threads which will
+# be created. In other words, only MaxClients number of clients can be
+# connected at the same time.
+#
+MaxClients 100
+
+#
+# MinSpareServers/MaxSpareServers: These settings set the upper and
+# lower limit for the number of spare servers which should be available.
+#
+# If the number of spare servers falls below MinSpareServers then new
+# server processes will be spawned.  If the number of servers exceeds
+# MaxSpareServers then the extras will be killed off.
+#
+MinSpareServers 5
+MaxSpareServers 20
+
+#
+# StartServers: The number of servers to start initially.
+#
+StartServers 10
+
+#
+# MaxRequestsPerChild: The number of connections a thread will handle
+# before it is killed. In practise this should be set to 0, which
+# disables thread reaping. If you do notice problems with memory
+# leakage, then set this to something like 10000.
+#
+MaxRequestsPerChild 0
+
+#
+# Allow: Customization of authorization controls. If there are any
+# access control keywords then the default action is to DENY. Otherwise,
+# the default action is ALLOW.
+#
+# The order of the controls are important. All incoming connections are
+# tested against the controls based on order.
+#
+Allow 127.0.0.1
+Allow 0.0.0.0/0
+
+#
+# AddHeader: Adds the specified headers to outgoing HTTP requests that
+# Tinyproxy makes. Note that this option will not work for HTTPS
+# traffic, as Tinyproxy has no control over what headers are exchanged.
+#
+#AddHeader "X-My-Header" "Powered by Tinyproxy"
+
+#
+# ViaProxyName: The "Via" header is required by the HTTP RFC, but using
+# the real host name is a security concern.  If the following directive
+# is enabled, the string supplied will be used as the host name in the
+# Via header; otherwise, the server's host name will be used.
+#
+ViaProxyName "tinyproxy"
+
+#
+# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add
+# the Via header to the requests. This virtually puts Tinyproxy into
+# stealth mode. Note that RFC 2616 requires proxies to set the Via
+# header, so by enabling this option, you break compliance.
+# Don't disable the Via header unless you know what you are doing...
+#
+#DisableViaHeader Yes
+
+#
+# Filter: This allows you to specify the location of the filter file.
+#
+#Filter "/etc/tinyproxy/filter"
+
+#
+# FilterURLs: Filter based on URLs rather than domains.
+#
+#FilterURLs On
+
+#
+# FilterExtended: Use POSIX Extended regular expressions rather than
+# basic.
+#
+#FilterExtended On
+
+#
+# FilterCaseSensitive: Use case sensitive regular expressions.
+#
+#FilterCaseSensitive On
+
+#
+# FilterDefaultDeny: Change the default policy of the filtering system.
+# If this directive is commented out, or is set to "No" then the default
+# policy is to allow everything which is not specifically denied by the
+# filter file.
+#
+# However, by setting this directive to "Yes" the default policy becomes
+# to deny everything which is _not_ specifically allowed by the filter
+# file.
+#
+#FilterDefaultDeny Yes
+
+#
+# Anonymous: If an Anonymous keyword is present, then anonymous proxying
+# is enabled.  The headers listed are allowed through, while all others
+# are denied. If no Anonymous keyword is present, then all headers are
+# allowed through.  You must include quotes around the headers.
+#
+# Most sites require cookies to be enabled for them to work correctly, so
+# you will need to allow Cookies through if you access those sites.
+#
+#Anonymous "Host"
+#Anonymous "Authorization"
+#Anonymous "Cookie"
+
+#
+# ConnectPort: This is a list of ports allowed by tinyproxy when the
+# CONNECT method is used.  To disable the CONNECT method altogether, set
+# the value to 0.  If no ConnectPort line is found, all ports are
+# allowed (which is not very secure.)
+#
+# The following two ports are used by SSL.
+#
+ConnectPort 443
+ConnectPort 563
+
+#
+# Configure one or more ReversePath directives to enable reverse proxy
+# support. With reverse proxying it's possible to make a number of
+# sites appear as if they were part of a single site.
+#
+# If you uncomment the following two directives and run tinyproxy
+# on your own computer at port 8888, you can access Google using
+# http://localhost:8888/google/ and Wired News using
+# http://localhost:8888/wired/news/. Neither will actually work
+# until you uncomment ReverseMagic as they use absolute linking.
+#
+#ReversePath "/google/"	"http://www.google.com/"
+#ReversePath "/wired/"	"http://www.wired.com/"
+
+#
+# When using tinyproxy as a reverse proxy, it is STRONGLY recommended
+# that the normal proxy is turned off by uncommenting the next directive.
+#
+#ReverseOnly Yes
+
+#
+# Use a cookie to track reverse proxy mappings. If you need to reverse
+# proxy sites which have absolute links you must uncomment this.
+#
+#ReverseMagic Yes
+
+#
+# The URL that's used to access this reverse proxy. The URL is used to
+# rewrite HTTP redirects so that they won't escape the proxy. If you
+# have a chain of reverse proxies, you'll need to put the outermost
+# URL here (the address which the end user types into his/her browser).
+#
+# If not set then no rewriting occurs.
+#
+#ReverseBaseURL "http://localhost:8888/"
+
+
+
+
+### foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.10
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -183,6 +183,17 @@ files:
 - test/issues/199/spec/default/redhat_spec.rb
 - test/issues/199/spec/spec_helper.rb
 - test/issues/199/tinyproxy.conf
+- test/issues/218/.rspec
+- test/issues/218/Dockerfile
+- test/issues/218/README.md
+- test/issues/218/Rakefile
+- test/issues/218/Vagrantfile
+- test/issues/218/entrypoint.sh
+- test/issues/218/force-all-outbound-traffic-through-proxy.iptables
+- test/issues/218/spec/default/redhat_spec.rb
+- test/issues/218/spec/docker_host/redhat_spec.rb
+- test/issues/218/spec/spec_helper.rb
+- test/issues/218/tinyproxy.conf
 - travis/before_install
 - vagrant-proxyconf.gemspec
 homepage: http://tmatilai.github.io/vagrant-proxyconf/
@@ -305,3 +316,14 @@ test_files:
 - test/issues/199/spec/default/redhat_spec.rb
 - test/issues/199/spec/spec_helper.rb
 - test/issues/199/tinyproxy.conf
+- test/issues/218/.rspec
+- test/issues/218/Dockerfile
+- test/issues/218/README.md
+- test/issues/218/Rakefile
+- test/issues/218/Vagrantfile
+- test/issues/218/entrypoint.sh
+- test/issues/218/force-all-outbound-traffic-through-proxy.iptables
+- test/issues/218/spec/default/redhat_spec.rb
+- test/issues/218/spec/docker_host/redhat_spec.rb
+- test/issues/218/spec/spec_helper.rb
+- test/issues/218/tinyproxy.conf