vagrant-unbundled 2.2.6.0 → 2.2.9.0

data/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb

@@ -7,8 +7,7 @@ module VagrantPlugins
         module Debian
           module AnsibleInstall
 
-
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               case install_mode
               when :pip
                 pip_setup machine, pip_install_cmd
@@ -33,12 +32,12 @@ INLINE_CRIPT
 
               machine.communicate.sudo install_backports_if_wheezy_release
               machine.communicate.sudo "apt-get update -y -qq"
-              machine.communicate.sudo "apt-get install -y -qq ansible"
+              machine.communicate.sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --option \"Dpkg::Options::=--force-confold\" ansible"
             end
 
-            def self.pip_setup(machine, pip_install_cmd="")
+            def self.pip_setup(machine, pip_install_cmd = "")
               machine.communicate.sudo "apt-get update -y -qq"
-              machine.communicate.sudo "apt-get install -y -qq build-essential curl git libssl-dev libffi-dev python-dev"
+              machine.communicate.sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --option \"Dpkg::Options::=--force-confold\" build-essential curl git libssl-dev libffi-dev python-dev"
               Pip::get_pip machine, pip_install_cmd
             end
 

data/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
         module Fedora
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               case install_mode
               when :pip
                 pip_setup machine, pip_install_cmd
@@ -25,7 +25,7 @@ module VagrantPlugins
 
             private
 
-            def self.pip_setup(machine, pip_install_cmd="")
+            def self.pip_setup(machine, pip_install_cmd = "")
               rpm_package_manager = Facts::rpm_package_manager(machine)
 
               machine.communicate.sudo "#{rpm_package_manager} install -y curl gcc gmp-devel libffi-devel openssl-devel python-crypto python-devel python-dnf python-setuptools redhat-rpm-config"

data/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb

@@ -7,11 +7,11 @@ module VagrantPlugins
         module FreeBSD
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               if install_mode != :default
                 raise Ansible::Errors::AnsiblePipInstallIsNotSupported
               else
-                machine.communicate.sudo "yes | pkg install ansible"
+                machine.communicate.sudo "pkg install -qy py36-ansible"
               end
             end
 

data/plugins/provisioners/ansible/cap/guest/pip/pip.rb

@@ -16,19 +16,23 @@ module VagrantPlugins
             end
 
             args_array = [pip_args, upgrade_arg, "#{package}#{version_arg}"]
+            args_array.reject! { |a| a.nil? || a.empty? }
 
-            machine.communicate.sudo "pip install #{args_array.join(' ')}"
+            pip_install = "pip install"
+            pip_install += " #{args_array.join(' ')}" unless args_array.empty?
+
+            machine.communicate.sudo pip_install
           end
 
-          def self.get_pip(machine, pip_install_cmd=DEFAULT_PIP_INSTALL_CMD)
+          def self.get_pip(machine, pip_install_cmd = DEFAULT_PIP_INSTALL_CMD)
             # The objective here is to get pip either by default
-            # or by the argument passed in. The objective is not 
+            # or by the argument passed in. The objective is not
             # to circumvent the pip setup by passing in nothing.
             # Thus, we stick with the default on an empty string.
             # Typecast added in the check for safety.
 
             if pip_install_cmd.to_s.empty?
-              pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
+              pip_install_cmd = DEFAULT_PIP_INSTALL_CMD
             end
 
             machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing_pip")

data/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
         module RedHat
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               case install_mode
               when :pip
                 pip_setup machine, pip_install_cmd
@@ -33,7 +33,7 @@ module VagrantPlugins
               machine.communicate.sudo "#{rpm_package_manager} -y --enablerepo=epel install ansible"
             end
 
-            def self.pip_setup(machine, pip_install_cmd="")
+            def self.pip_setup(machine, pip_install_cmd = "")
               rpm_package_manager = Facts::rpm_package_manager(machine)
 
               machine.communicate.sudo("#{rpm_package_manager} -y install curl gcc libffi-devel openssl-devel python-crypto python-devel python-setuptools")

data/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb

@@ -1,3 +1,4 @@
+require_relative "../../../errors"
 
 module VagrantPlugins
   module Ansible
@@ -6,7 +7,7 @@ module VagrantPlugins
         module SUSE
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               if install_mode != :default
                 raise Ansible::Errors::AnsiblePipInstallIsNotSupported
               else

data/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         module Ubuntu
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
               if install_mode != :default
                 Debian::AnsibleInstall::ansible_install machine, install_mode, ansible_version, pip_args, pip_install_cmd
               else
@@ -21,13 +21,13 @@ module VagrantPlugins
               unless machine.communicate.test("test -x \"$(which add-apt-repository)\"")
                 machine.communicate.sudo """
                   apt-get update -y -qq && \
-                  apt-get install -y -qq software-properties-common
+                  DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common --option \"Dpkg::Options::=--force-confold\"
                 """
               end
               machine.communicate.sudo """
                 add-apt-repository ppa:ansible/ansible -y && \
                 apt-get update -y -qq && \
-                apt-get install -y -qq ansible
+                DEBIAN_FRONTEND=noninteractive apt-get install -y -qq ansible --option \"Dpkg::Options::=--force-confold\"
               """
             end
 

data/plugins/provisioners/ansible/plugin.rb

@@ -45,6 +45,11 @@ module VagrantPlugins
         Cap::Guest::Arch::AnsibleInstall
       end
 
+      guest_capability(:alpine, :ansible_install) do
+        require_relative "cap/guest/alpine/ansible_install"
+        Cap::Guest::Alpine::AnsibleInstall
+      end
+
       guest_capability(:debian, :ansible_install) do
         require_relative "cap/guest/debian/ansible_install"
         Cap::Guest::Debian::AnsibleInstall

data/plugins/provisioners/ansible/provisioner/base.rb

@@ -375,7 +375,7 @@ gathered version stdout version:
             config.compatibility_mode = Ansible::COMPATIBILITY_MODE_V2_0
           end
 
-          @machine.env.ui.warn(I18n.t("vagrant.provisioners.ansible.compatibility_mode_warning",
+          @logger.info(I18n.t("vagrant.provisioners.ansible.compatibility_mode_warning",
             compatibility_mode: config.compatibility_mode,
             ansible_version: @gathered_version) +
           "\n")

data/plugins/provisioners/container/client.rb

@@ -0,0 +1,203 @@
+require 'digest/sha1'
+
+module VagrantPlugins
+  module ContainerProvisioner
+    class Client
+      def initialize(machine, container_command)
+        @machine = machine
+        @container_command =  container_command
+      end
+
+      # Build an image given a path to a Dockerfile
+      #
+      # @param [String] - Path to the Dockerfile to pass to
+      #   container build command
+      def build_images(images)
+        @machine.communicate.tap do |comm|
+          images.each do |path, opts|
+            @machine.ui.info(I18n.t("vagrant.container_building_single", path: path))
+            comm.sudo("#{@container_command} build #{opts[:args]} #{path}") do |type, data|
+              handle_comm(type, data)
+            end
+          end
+        end
+      end
+
+      # Pull image given a list of images
+      #
+      # @param [String] - Image name
+      def pull_images(*images)
+        @machine.communicate.tap do |comm|
+          images.each do |image|
+            @machine.ui.info(I18n.t("vagrant.container_pulling_single", name: image))
+            comm.sudo("#{@container_command} pull #{image}") do |type, data|
+              handle_comm(type, data)
+            end
+          end
+        end
+      end
+
+      def run(containers)
+        containers.each do |name, config|
+          cids_dir = "/var/lib/vagrant/cids"
+          config[:cidfile] ||= "#{cids_dir}/#{Digest::SHA1.hexdigest name}"
+
+          @machine.ui.info(I18n.t("vagrant.container_running", name: name))
+          @machine.communicate.sudo("mkdir -p #{cids_dir}")
+          run_container({
+            name: name,
+            original_name: name,
+          }.merge(config))
+        end
+      end
+
+      # Run a OCI container. If the container does not exist it will be
+      # created. If the image is stale it will be recreated and restarted
+      def run_container(config)
+        raise "Container's cidfile was not provided!" if !config[:cidfile]
+
+        id = "$(cat #{config[:cidfile]})"
+
+        if container_exists?(id)
+          if container_args_changed?(config)
+            @machine.ui.info(I18n.t("vagrant.container_restarting_container_args",
+              name: config[:name],
+            ))
+            stop_container(id)
+            create_container(config)
+          elsif container_image_changed?(config)
+            @machine.ui.info(I18n.t("vagrant.container_restarting_container_image",
+              name: config[:name],
+            ))
+            stop_container(id)
+            create_container(config)
+          else
+            start_container(id)
+          end
+        else
+          create_container(config)
+        end
+      end
+
+      def container_exists?(id)
+        lookup_container(id, true)
+      end
+
+      # Start container
+      #
+      # @param String - Image id
+      def start_container(id)
+        if !container_running?(id)
+          @machine.communicate.sudo("#{@container_command} start #{id}")
+        end
+      end
+
+      # Stop and remove container
+      #
+      # @param String - Image id
+      def stop_container(id)
+        @machine.communicate.sudo %[
+          #{@container_command} stop #{id}
+          #{@container_command} rm #{id}
+        ]
+      end
+
+      def container_running?(id)
+        lookup_container(id)
+      end
+
+      def container_image_changed?(config)
+        # Returns true if there is a container running with the given :name,
+        # and the container is not using the latest :image.
+
+        # Here, "<cmd> inspect <container>" returns the id of the image
+        # that the container is using. We check that the latest image that
+        # has been built with that name (:image)  matches the one that the
+        # container is running.
+        cmd = ("#{@container_command} inspect --format='{{.Image}}' #{config[:name]} |" +
+               " grep $(#{@container_command} images -q #{config[:image]})")
+        return !@machine.communicate.test(cmd)
+      end
+
+      def container_args_changed?(config)
+        path = container_data_path(config)
+        return true if !path.exist?
+
+        args = container_run_args(config)
+        sha  = Digest::SHA1.hexdigest(args)
+        return true if path.read.chomp != sha
+
+        return false
+      end
+
+      def create_container(config)
+        args = container_run_args(config)
+
+        @machine.communicate.sudo %[rm -f "#{config[:cidfile]}"]
+        @machine.communicate.sudo %[#{@container_command} run #{args}]
+
+        sha  = Digest::SHA1.hexdigest(args)
+        container_data_path(config).open("w+") do |f|
+          f.write(sha)
+        end
+      end
+
+      # Looks up if a container with a given id exists using the
+      # `ps` command. Returns Boolean
+      #
+      # @param String - Image id
+      def lookup_container(id, list_all = false)
+        container_ps = "sudo #{@container_command} ps -q"
+        container_ps << " -a" if list_all
+        @machine.communicate.tap do |comm|
+          return comm.test("#{container_ps} --no-trunc | grep -wFq #{id}")
+        end
+      end
+
+      def container_name(config)
+        name = config[:name]
+
+        # If the name is the automatically assigned name, then
+        # replace the "/" with "-" because "/" is not a valid
+        # character for a container name.
+        name = name.gsub("/", "-") if name == config[:original_name]
+        name
+      end
+
+      # Compiles run arguments to be appended to command string.
+      # Returns String
+      def container_run_args(config)
+        name = container_name(config)
+
+        args = "--cidfile=#{config[:cidfile]} "
+        args << "-d " if config[:daemonize]
+        args << "--name #{name} " if name && config[:auto_assign_name]
+        args << "--restart=#{config[:restart]}" if config[:restart]
+        args << " #{config[:args]}" if config[:args]
+
+        "#{args} #{config[:image]} #{config[:cmd]}".strip
+      end
+
+      def container_data_path(config)
+        name = container_name(config)
+        @machine.data_dir.join("#{@container_command}-#{name}")
+      end
+
+      protected
+
+      # This handles outputting the communication data back to the UI
+      def handle_comm(type, data)
+        if [:stderr, :stdout].include?(type)
+          # Clear out the newline since we add one
+          data = data.chomp
+          return if data.empty?
+
+          options = {}
+          #options[:color] = color if !config.keep_color
+
+          @machine.ui.info(data.chomp, options)
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/container/config.rb

@@ -0,0 +1,83 @@
+require 'set'
+
+module VagrantPlugins
+  module ContainerProvisioner
+    class Config < Vagrant.plugin("2", :config)
+      attr_reader :images
+      attr_accessor :post_install_provisioner
+
+      def initialize
+        @images = Set.new
+        @post_install_provisioner = nil
+
+        @__build_images   = []
+        @__containers     = Hash.new { |h, k| h[k] = {} }
+      end
+
+      # Accessor for internal state.
+      def build_images
+        @__build_images
+      end
+
+      # Accessor for the internal state.
+      def containers
+        @__containers
+      end
+
+      # Defines an image to build using `<cmd> build` within the machine.
+      #
+      # @param [String] path Path to the Dockerfile to pass to
+      #   container build command
+      def build_image(path, **opts)
+        @__build_images << [path, opts]
+      end
+
+      def images=(images)
+        @images = Set.new(images)
+      end
+
+      def pull_images(*images)
+        @images += images.map(&:to_s)
+      end
+
+      def post_install_provision(name, **options, &block)
+        proxy = VagrantPlugins::Kernel_V2::VMConfig.new
+        proxy.provision(name, **options, &block)
+        @post_install_provisioner = proxy.provisioners.first
+      end
+
+      def run(name, **options)
+        @__containers[name.to_s] = options.dup
+      end
+
+      def merge(other)
+        super.tap do |result|
+          result.pull_images(*(other.images + self.images))
+
+          build_images = @__build_images.dup
+          build_images += other.build_images
+          result.instance_variable_set(:@__build_images, build_images)
+
+          containers = {}
+          @__containers.each do |name, params|
+            containers[name] = params.dup
+          end
+          other.containers.each do |name, params|
+            containers[name] = @__containers[name].merge(params)
+          end
+
+          result.instance_variable_set(:@__containers, containers)
+        end
+      end
+
+      def finalize!
+        @__containers.each do |name, params|
+          params[:image] ||= name
+          params[:auto_assign_name] = true if !params.key?(:auto_assign_name)
+          params[:daemonize] = true if !params.key?(:daemonize)
+          params[:restart] = "always" if !params.key?(:restart)
+        end
+      end
+    end
+  end
+end