vagrant-proxyconf 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac37fdd26574b0bda6d18e20f6da96d3e0ef3fe4793dac9b89c850c65ff08f07
-  data.tar.gz: 51b17d465cd2ccad3a0c8b59b7b81fc841462f071029352db6faf7cb65c700f5
+  metadata.gz: '09ccd0a2a51d1de18dc63c8355c6f6d4217faf1d31b470a0de6348c514a5c621'
+  data.tar.gz: 6384262695d6fffd759de258efb6c70ddd52a434fb1ead968ea0f0f8aa225ba3
 SHA512:
-  metadata.gz: aeb84b8421bab091fb48ed298371e15c369ab4d2adbf69811d0458bcd9103a014444a1f82539bbc006197db8700d93c5f34adee479a9147f7db0d013d2cf4efd
-  data.tar.gz: 6163910bf920cefb2edb163c09aa0575a322f167c3d3be5b1f9d3c292e54b455b454b5941a8bdc4552be8f577f79c21fd8770fe05b09b4130feebfa77bb72df2
+  metadata.gz: df0979eae22816e8a23ebddaf8e0874d0e6b5b8a9ae79e66499cb4bc418e47c300483dd1dc889e6324c7169636d4c4b2cffcfbc67c17e21170b3b178654211ce
+  data.tar.gz: ad5f86225dd89c3ce59c2fb50f72b10375e53f1b630de6e28ae53b3f4677507f26114ee991e467408b3c0cc612297cd87284400b2e7cdf50fdcc6007baf21658

data/.travis.yml

@@ -1,15 +1,21 @@
+---
+
 language: ruby
 cache: bundler
 sudo: false
 
 before_install: ./travis/before_install
+install: bundle install --path .bundle/gems
+script: bundle exec rspec
 bundler_args: --without=development
 
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-rvm: 2.4.4
+rvm:
+  - 2.4.4
+
 matrix:
   include:
     - env: VAGRANT_VERSION=v2.2.4

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-# 2.0.7 / NOT_RELEASED_YET
+# 2.0.7 / 2019-11-14
+
+This is a bug fix release.
+
+- Addresses issues with docker proxy configuration and permissions.
+
+#### Closed Issues
+
+- https://github.com/tmatilai/vagrant-proxyconf/milestone/3
+
+
+#### Credits
+
+Thank you to these folks how identified the bugs and provided
+workarounds.
+
+- @antoinetran
+- @tkang007
+
 
 # 2.0.6 / 2019-08-09
 

data/Gemfile

@@ -19,7 +19,7 @@ end
 
 gem 'vagrant',
     git: 'https://github.com/hashicorp/vagrant.git',
-    ref: ENV.fetch('VAGRANT_VERSION', 'v2.2.4')
+    tag: ENV.fetch('VAGRANT_VERSION', 'v2.2.4')
 
 gem 'rake'
 gem 'rspec', '~> 3.1'

data/Jenkinsfile

@@ -0,0 +1,60 @@
+pipeline {
+
+  agent { label 'virtualbox' }
+
+  options {
+    disableConcurrentBuilds()
+  }
+
+  parameters {
+
+    string(
+      name: 'VAGRANT_TEST_ISSUE',
+      defaultValue: '180',
+      description: 'The test/issues/# where "#" refers to the test environment to invoke'
+    )
+
+    string(
+      name: 'DEFAULT_RVM_RUBY',
+      defaultValue: '2.4.4',
+      description: 'The default ruby to use for RVM'
+    )
+
+  }
+
+  stages {
+
+    stage('test') {
+
+      environment {
+        VAGRANT_TEST_ISSUE = "${params.VAGRANT_TEST_ISSUE}"
+        DEFAULT_RVM_RUBY = "${params.DEFAULT_RVM_RUBY}"
+      }
+
+      steps {
+        timestamps {
+          ansiColor('xterm') {
+
+            dir("${WORKSPACE}") {
+
+              sh '''#!/usr/bin/env bash -l
+
+                set +x
+                tty
+                . jenkins/helper_functions
+
+                setup_test_env
+
+                set -e
+                run_all_tests
+
+              '''
+            }
+          }
+        }
+      }
+    }
+
+  } // stages
+
+}

data/jenkins/helper_functions

@@ -0,0 +1,206 @@
+#!/usr/bin/env bash
+
+DEFAULT_RVM_RUBY="${DEFAULT_RVM_RUBY:-2.4.4}"
+
+RVM_HOME_DIR="${RVM_HOME_DIR:-${HOME}/.rvm/scripts/rvm}"
+
+VAGRANT_TEST_ISSUE="${VAGRANT_TEST_ISSUE:-180}"
+
+err() {
+
+  echo "ERR: $* exiting" >&2
+
+  reset_docker_perms || true
+
+  exit 1
+
+}
+
+
+bundle_exec() {
+
+  local run_dir="test/issues/${VAGRANT_TEST_ISSUE}"
+
+  pushd "${run_dir}" || err "The directory: '${run_dir}' does not exist" && true
+
+  bundle exec $@
+
+  popd >>/dev/null 2>&1
+
+}
+
+
+enable_rvm_ruby() {
+
+  local ruby_version="${1:-${DEFAULT_RVM_RUBY}}"
+
+  shift
+  local persist="${1:-persist}"
+
+
+  [ -f "${RVM_HOME_DIR}" ] && . "${RVM_HOME_DIR}" >> /dev/null || true
+
+  rvm use "ruby-${ruby_version}" || err "Unable to switch to ruby ${ruby_version}"
+
+  [ -z "${persist}" ] || echo "${DEFAULT_RVM_RUBY}" > .ruby-version
+
+}
+
+
+enable_rbenv_ruby() {
+
+  local ruby_version="${1:-${DEFAULT_RVM_RUBY}}"
+
+  shift
+  local persist="${1:-persist}"
+
+  eval "$(rbenv init -)"
+
+  rbenv_install "${DEFAULT_RVM_RUBY}"
+
+  if [ -n "${persist}" ]; then
+
+    echo "${DEFAULT_RVM_RUBY}" > .ruby-version
+
+    rbenv shell "${DEFAULT_RVM_RUBY}"
+
+  fi
+
+  rbenv versions
+
+}
+
+rbenv_install() {
+
+    rbenv versions | grep -q "${1}" || rbenv install "${1}"
+
+}
+
+vagrant_cmd() {
+
+  bundle_exec vagrant $@
+
+}
+
+
+install_gems() {
+
+  command -v bundle >>/dev/null 2>&1 || gem install bundler --no-doc
+  command -v rake >>/dev/null 2>&1 || gem install rake --no-doc
+
+  gem update --system --no-doc || err "Updating system gems"
+
+  rm -f Gemfile.lock
+  bundle install --path .bundle/gems
+
+}
+
+
+install_from_gemfile() {
+
+  [ -d ".bundle/gems" ] || install_gems
+
+}
+
+
+run_all_tests() {
+
+  set -e
+
+  vagrant_cmd status
+  bundle_exec rake spec
+
+  set +e
+
+}
+
+
+setup_test_env() {
+
+  set -e
+
+  whoami
+  env
+
+  ruby -v
+  gem list
+
+  install_from_gemfile
+
+  bundle show
+
+  update_docker_perms
+
+  vagrant_cmd plugin repair || true
+  vagrant_cmd status
+  vagrant_cmd up || err "Starting the virtual machine"
+  vagrant_cmd provision || err "Attempting to provision the virtual machine"
+
+  reset_docker_perms
+
+  set +e
+
+}
+
+
+reset_docker_perms() {
+
+  [ -L /var/run/docker.sock ] && sudo chmod 0770 "$(readlink /var/run/docker.sock)" || true
+
+}
+
+update_docker_perms() {
+
+  [ -L /var/run/docker.sock ] && sudo chmod 6770 "$(readlink /var/run/docker.sock)" || true
+
+}
+
+
+is_container_running() {
+
+  CONTAINER_ID=$(docker ps -a | grep ':8888' | awk '{print $1}')
+
+  [ -z "${CONTAINER_ID}" ] && return 0
+
+  echo "${CONTAINER_ID}"
+  return 1
+
+}
+
+
+initialize() {
+  reset_docker_perms
+
+  OS_TYPE="$(uname -s 2>>/dev/null)"
+
+  case "${OS_TYPE}" in
+
+    Darwin)
+      HOME_DIR_PREFIX="/Users"
+      ;;
+
+    *)
+      HOME_DIR_PREFIX="/home"
+      ;;
+
+  esac
+
+  [ -f ${HOME_DIR_PREFIX}/jenkins/.bash_profile ] && . ${HOME_DIR_PREFIX}/jenkins/.bash_profile || true
+  [ -f ${HOME_DIR_PREFIX}/jenkins/.bashrc ] && . ${HOME_DIR_PREFIX}/jenkins/.bashrc || true
+
+  command -v rvm >>/dev/null 2>&1 && enable_rvm_ruby "${DEFAULT_RVM_RUBY}" "persist" || true
+  command -v rbenv >>/dev/null 2>&1 && enable_rbenv_ruby "${DEFAULT_RVM_RUBY}" "persist" || true
+
+  command -v docker || err "Docker must be installed on this host."
+  command -v bsdtar || err "Please install bsdtar"
+
+  id
+  groups
+
+  CONTAINER_ID=$(is_container_running)
+  [ $? -ne 0 ] && docker rm -vf "${CONTAINER_ID}"
+
+  reset_docker_perms
+}
+
+initialize

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

@@ -97,9 +97,9 @@ module VagrantPlugins
           @machine.communicate.tap do |comm|
             comm.upload(@docker_client_config_path.path, "/tmp/vagrant-proxyconf-docker-config.json")
             comm.sudo("mkdir -p /etc/docker")
-            comm.sudo("chown root:root /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:root /etc/docker/config.json")
+            comm.sudo("chown root:docker /etc/docker/config.json")
             comm.sudo("chmod 0644 /etc/docker/config.json")
             comm.sudo("rm -f /tmp/vagrant-proxyconf-docker-config.json")
 
@@ -155,6 +155,7 @@ module VagrantPlugins
             end
 
             comm.sudo('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            comm.sudo('touch /etc/systemd/system/docker.service.d/http-proxy.conf')
             comm.sudo('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
 
             if changed
@@ -236,7 +237,7 @@ module VagrantPlugins
 
           # update config and restart docker when config changed
           comm.sudo("chmod 0644 #{path}.new")
-          comm.sudo("chown root:root #{path}.new")
+          comm.sudo("chown root:docker #{path}.new")
           comm.sudo("mv -f #{path}.new #{path}")
           comm.sudo(service_restart_command)
         end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '2.0.6'
+    VERSION = '2.0.7'
   end
 end

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

@@ -10,7 +10,7 @@ def mock_write_docker_config(machine)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("cat /tmp/vagrant-proxyconf >> /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :test).with("diff /etc/default/docker.new /etc/default/docker")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/default/docker.new")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/default/docker.new")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mv -f /etc/default/docker.new /etc/default/docker")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("kill -HUP `pgrep -f 'docker'` || systemctl restart docker || service docker restart || /etc/init.d/docker restart")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf /etc/default/docker.new")
@@ -19,13 +19,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:root /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("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:root /etc/docker")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:docker /etc/docker")
 end
 
 def mock_update_docker_systemd_config(machine)
@@ -164,6 +164,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
             allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/systemd/system/docker.service.d")
             allow(machine).to receive_message_chain(:communicate, :upload).with(@docker_proxy.instance_variable_get(:@docker_systemd_config), "/tmp")
             allow(machine).to receive_message_chain(:communicate, :sudo).with('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('touch /etc/systemd/system/docker.service.d/http-proxy.conf')
             allow(machine).to receive_message_chain(:communicate, :sudo).with('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
             allow(machine).to receive_message_chain(:communicate, :test).with('command -v systemctl').and_return(false)
             allow(machine).to receive_message_chain(:communicate, :test).with('diff -Naur /etc/systemd/system/docker.service.d/http-proxy.conf /tmp/vagrant-proxyconf-docker-systemd-config').and_return(false)

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

@@ -10,9 +10,9 @@ end
 describe file('/etc/docker/config.json') do
   it { should be_file }
   it { should exist }
-  it { should be_mode 600 }
+  it { should be_mode 644 }
   it { should be_owned_by "root" }
-  it { should be_grouped_into "root" }
+  it { should be_grouped_into "docker" }
 end
 
 context 'when proxy is enabled' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -23,6 +23,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -33,6 +34,7 @@ files:
 - development/install-c7.sh
 - development/install-debian.sh
 - development/tinyproxy.conf
+- jenkins/helper_functions
 - lib/vagrant-proxyconf.rb
 - lib/vagrant-proxyconf/action.rb
 - lib/vagrant-proxyconf/action/base.rb
@@ -200,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers