vagrant-unbundled 2.2.6.0 → 2.2.9.0

data/plugins/provisioners/container/installer.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module ContainerProvisioner
+    class Installer
+      def initialize(machine)
+        @machine = machine
+      end
+
+      def ensure_installed
+        # nothing to do
+      end
+    end
+  end
+end

data/plugins/provisioners/container/plugin.rb

@@ -0,0 +1,23 @@
+require "vagrant"
+
+module VagrantPlugins
+  module ContainerProvisioner
+    class Plugin < Vagrant.plugin("2")
+      name "container"
+      description <<-DESC
+      Provides support for provisioning your virtual machines with
+      OCI images and containers.
+      DESC
+
+      config(:container, :provisioner) do
+        require_relative "config"
+        Config
+      end
+
+      provisioner(:container) do
+        require_relative "provisioner"
+        Provisioner
+      end
+    end
+  end
+end

data/plugins/provisioners/container/provisioner.rb

@@ -0,0 +1,28 @@
+require_relative "client"
+require_relative "installer"
+
+module VagrantPlugins
+  module ContainerProvisioner
+    class Provisioner < Vagrant.plugin("2", :provisioner)
+      def initialize(machine, config, installer = nil, client = nil)
+        super(machine, config)
+
+        @installer = installer || Installer.new(@machine)
+        @client    = client    || Client.new(@machine, "")
+        @logger = Log4r::Logger.new("vagrant::provisioners::container")
+      end
+
+      def provision
+        # nothing to do
+      end
+
+      def run_provisioner(env)
+        klass  = Vagrant.plugin("2").manager.provisioners[env[:provisioner].type]
+        result = klass.new(env[:machine], env[:provisioner].config)
+        result.config.finalize!
+
+        result.provision
+      end
+    end
+  end
+end

data/plugins/provisioners/docker/cap/{redhat → centos}/docker_install.rb

@@ -1,31 +1,34 @@
 module VagrantPlugins
   module DockerProvisioner
     module Cap
-      module Redhat
+      module Centos
         module DockerInstall
           def self.docker_install(machine)
             machine.communicate.tap do |comm|
               comm.sudo("yum -q -y update")
               comm.sudo("yum -q -y remove docker-io* || true")
-              comm.sudo("curl -sSL https://get.docker.com/ | sh")
+              comm.sudo("yum install -y -q yum-utils")
+              comm.sudo("yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo")
+              comm.sudo("yum makecache")
+              comm.sudo("yum install -y -q docker-ce")
             end
 
             case machine.guest.capability("flavor")
-            when :rhel_7
-              docker_enable_rhel7(machine)
+            when :centos
+              docker_enable_service(machine)
             else
-              docker_enable_default(machine)
+              docker_enable_systemctl(machine)
             end
           end
 
-          def self.docker_enable_rhel7(machine)
+          def self.docker_enable_systemctl(machine)
             machine.communicate.tap do |comm|
               comm.sudo("systemctl start docker.service")
               comm.sudo("systemctl enable docker.service")
             end
           end
 
-          def self.docker_enable_default(machine)
+          def self.docker_enable_service(machine)
             machine.communicate.tap do |comm|
               comm.sudo("service docker start")
               comm.sudo("chkconfig docker on")

data/plugins/provisioners/docker/cap/centos/docker_start_service.rb

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module DockerProvisioner
+    module Cap
+      module Centos
+        module DockerStartService
+          def self.docker_start_service(machine)
+            case machine.guest.capability("flavor")
+            when :centos
+              machine.communicate.tap do |comm|
+                comm.sudo("service docker start")
+                comm.sudo("chkconfig docker on")
+              end
+            else
+              machine.communicate.tap do |comm|
+                comm.sudo("systemctl start docker.service")
+                comm.sudo("systemctl enable docker.service")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/docker/client.rb

@@ -1,32 +1,11 @@
-require 'digest/sha1'
+require_relative "../container/client"
 
 module VagrantPlugins
   module DockerProvisioner
-    class Client
+    class Client < VagrantPlugins::ContainerProvisioner::Client
       def initialize(machine)
-        @machine = machine
-      end
-
-      def build_images(images)
-        @machine.communicate.tap do |comm|
-          images.each do |path, opts|
-            @machine.ui.info(I18n.t("vagrant.docker_building_single", path: path))
-            comm.sudo("docker build #{opts[:args]} #{path}") do |type, data|
-              handle_comm(type, data)
-            end
-          end
-        end
-      end
-
-      def pull_images(*images)
-        @machine.communicate.tap do |comm|
-          images.each do |image|
-            @machine.ui.info(I18n.t("vagrant.docker_pulling_single", name: image))
-            comm.sudo("docker pull #{image}") do |type, data|
-              handle_comm(type, data)
-            end
-          end
-        end
+        super(machine, "docker")
+        @container_command = "docker"
       end
 
       def start_service
@@ -39,156 +18,6 @@ module VagrantPlugins
         @machine.guest.capability(:docker_daemon_running)
       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.docker_running", name: name))
-          @machine.communicate.sudo("mkdir -p #{cids_dir}")
-          run_container({
-            name: name,
-            original_name: name,
-          }.merge(config))
-        end
-      end
-
-      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.docker_restarting_container_args",
-              name: config[:name],
-            ))
-            stop_container(id)
-            create_container(config)
-          elsif container_image_changed?(config)
-            @machine.ui.info(I18n.t("vagrant.docker_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
-
-      def start_container(id)
-        if !container_running?(id)
-          @machine.communicate.sudo("docker start #{id}")
-        end
-      end
-
-      def stop_container(id)
-        @machine.communicate.sudo %[
-          docker stop #{id}
-          docker 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, "docker 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 = ("docker inspect --format='{{.Image}}' #{config[:name]} |" +
-               " grep $(docker 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 %[docker run #{args}]
-
-        sha  = Digest::SHA1.hexdigest(args)
-        container_data_path(config).open("w+") do |f|
-          f.write(sha)
-        end
-      end
-
-      def lookup_container(id, list_all = false)
-        docker_ps = "sudo docker ps -q"
-        docker_ps << " -a" if list_all
-        @machine.communicate.tap do |comm|
-          # Docker < 0.7.0 stores container IDs using its short version while
-          # recent versions use the full container ID
-          # using full container ID from now on.
-          return comm.test("#{docker_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 docker container name.
-        name = name.gsub("/", "-") if name == config[:original_name]
-        name
-      end
-
-      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("docker-#{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/docker/config.rb

@@ -1,45 +1,8 @@
-require 'set'
+require_relative "../container/config"
 
 module VagrantPlugins
   module DockerProvisioner
-    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 `docker build` within the machine.
-      #
-      # @param [String] path Path to the Dockerfile to pass to
-      #   `docker build`.
-      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
-
+    class Config < VagrantPlugins::ContainerProvisioner::Config
       def post_install_provision(name, **options, &block)
         # Abort
         raise DockerError, :wrong_provisioner if options[:type] == "docker"
@@ -48,39 +11,6 @@ module VagrantPlugins
         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

data/plugins/provisioners/docker/installer.rb

@@ -1,10 +1,8 @@
+require_relative "../container/installer"
+
 module VagrantPlugins
   module DockerProvisioner
-    class Installer
-      def initialize(machine)
-        @machine = machine
-      end
-
+    class Installer < VagrantPlugins::ContainerProvisioner::Installer
       # This handles verifying the Docker installation, installing it if it was
       # requested, and so on. This method will raise exceptions if things are
       # wrong.

data/plugins/provisioners/docker/plugin.rb

@@ -29,14 +29,14 @@ module VagrantPlugins
         Cap::Fedora::DockerInstall
       end
 
-      guest_capability("redhat", "docker_install") do
-        require_relative "cap/redhat/docker_install"
-        Cap::Redhat::DockerInstall
+      guest_capability("centos", "docker_install") do
+        require_relative "cap/centos/docker_install"
+        Cap::Centos::DockerInstall
       end
 
-      guest_capability("redhat", "docker_start_service") do
-        require_relative "cap/redhat/docker_start_service"
-        Cap::Redhat::DockerStartService
+      guest_capability("centos", "docker_start_service") do
+        require_relative "cap/centos/docker_start_service"
+        Cap::Centos::DockerStartService
       end
 
       guest_capability("linux", "docker_installed") do