vagrant-docker-compose 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e5d58d541465149e8fb373443011d2d1463d55fea729cb72a392f5733b59b2
-  data.tar.gz: dbab6628e49ddcdf9457e44aa410f541a913b77a7b3eb249786b449c8164184c
+  metadata.gz: e2094b1904e3f3ffc9fb8082535a07fd879ca225acd2675b10f34f2bd3be01c6
+  data.tar.gz: 64fb9993e20906189927735d7d8a27d66d3a98a63910a4e4c2709322f121d155
 SHA512:
-  metadata.gz: 8c68389a3fd34d089e3d1d8060c02b33599ccabb5374ba592becb192078260c6bd55140cd496a4f4e12c189ee0d8b028c729e298714a9e75c594c76cd7ed7255
-  data.tar.gz: 2da064848a49afb2fc599b5ecff62702145c318256bbf923c1afcb009102bf93860fcd1a1bca6609678b88fd6569b007e510c34e730f7d765baca5265750ec7e
+  metadata.gz: dbb9e8572f25ebe7688817b34120ad9209ea853a65fa0967ee4f838d2cd3e692bacd952a41bc506dc7cc3d95b0515019793d00444942fb9664663361fd719d23
+  data.tar.gz: ed6a09c25f4168c10767bb13904fa32e9e1caeedabf3ad8ed2b75fef5dad9237b9e9735432d2a91c470eb0def94a3511408308f9a8fe5133bb6ffbcd48fc4a59

data/README.md

@@ -104,7 +104,7 @@ docker-compose --x-networking -f [yml] up -d --timeout 20
 ### Other configs
 
 * `yml` – one or more [Compose files](https://docs.docker.com/compose/compose-file/) (YAML), may be a `String` for a single file, or `Array` for multiple.
-* `compose_version` – defaults to `1.8.0`.
+* `compose_version` – defaults to `1.24.1`.
 * `project_name` – compose will default to naming the project `vagrant`.
 * `env` – a `Hash` of environment variables to value that are passed to the `docker-compose` commands, defaults to an empty `Hash`.
 * `executable_symlink_path` – the location the executable will be symlinked to, defaults to `/usr/local/bin/docker-compose`.

data/Vagrantfile

@@ -0,0 +1,42 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# ==============================================================================
+# This Vagrantfile is for testing the plugin. For an example of how to use the
+# plugin look at the Vagrantfile in the example directory.
+#
+# If you are developing or contributing to this plugin you can use this
+# Vagrantfile. It is designed to be run inside a Docker container that is
+# already on a network called 'devenv'. The Vagrantfile tells Vagrant to start
+# the machine on the 'devenv' network, and to give the container's name
+# 'vagrant'. While portforwarding to the host for SSH still takes place it is
+# ignored and Vagrant connects directly to the SSH port on the 'vagrant'
+# container.
+#
+# Before using this file you'll want to run this command to install vagrant as
+# a gem:
+#   bundle install
+#
+# To start vagrant it is important to always use bundle exec:
+#   bundle exec vagrant up
+#
+# To SSH into the container:
+#   bundle exec vagrant ssh
+#
+# To delete the container when finished:
+#   bundle exec vagrant destroy -f
+#
+# ==============================================================================
+
+Vagrant.configure("2") do |config|
+  config.vm.provider :docker do |d|
+    d.image = "vagrant" # https://github.com/leighmcculloch/vagrant-docker-image
+    d.has_ssh = true
+    d.create_args = ["--name=vagrant", "--network=devenv"]
+  end
+
+  config.ssh.host = "vagrant"
+  config.ssh.port = 22
+
+  config.vm.provision :docker_compose, run: "always"
+end

data/example/Vagrantfile

@@ -8,7 +8,7 @@ unless Vagrant.has_plugin?("vagrant-docker-compose")
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "hashicorp/precise64"
+  config.vm.box = "ubuntu/trusty64"
 
   port = 9090
 

data/lib/vagrant-docker-compose/cap/linux/docker_compose_get_info.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module DockerComposeProvisioner
+    module Cap
+      module Linux
+        module DockerComposeGetInfo
+          def self.docker_compose_get_info(machine, config)
+            comm = machine.communicate
+
+            kernel_name = ""
+            comm.execute("uname -s") do |type, data|
+              if type == :stdout
+                kernel_name << data
+              end
+            end
+            kernel_name.strip!
+
+            machine_hardware_name = ""
+            comm.execute("uname -m") do |type, data|
+              if type == :stdout
+                machine_hardware_name << data
+              end
+            end
+            machine_hardware_name.strip!
+
+            [machine_hardware_name, kernel_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-docker-compose/cap/linux/docker_compose_install.rb

@@ -3,11 +3,10 @@ module VagrantPlugins
     module Cap
       module Linux
         module DockerComposeInstall
-          def self.docker_compose_install(machine, config)
-            machine.communicate.tap do |comm|
-              comm.sudo("curl -L https://github.com/docker/compose/releases/download/#{config.compose_version}/docker-compose-`uname -s`-`uname -m` > #{config.executable_install_path}")
-              comm.sudo("chmod +x #{config.executable_install_path}")
-            end
+          def self.docker_compose_install(machine, config, remote_tmp_path)
+            comm = machine.communicate
+            comm.sudo("mv #{remote_tmp_path} #{config.executable_install_path}")
+            comm.sudo("chmod +x #{config.executable_install_path}")
           end
         end
       end

data/lib/vagrant-docker-compose/cap/linux/docker_compose_upload.rb

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module DockerComposeProvisioner
+    module Cap
+      module Linux
+        module DockerComposeUpload
+          def self.docker_compose_upload(machine, config, local_tmp_path)
+            comm = machine.communicate
+
+            remote_tmp_path = ""
+            comm.execute("mktemp") do |type, data|
+              if type == :stdout
+                remote_tmp_path << data
+              end
+            end
+            remote_tmp_path.strip!
+
+            comm.upload(local_tmp_path, remote_tmp_path)
+
+            remote_tmp_path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-docker-compose/installer.rb

@@ -10,8 +10,25 @@ module VagrantPlugins
         @machine.ui.detail(I18n.t(:checking_installation))
 
         if !@machine.guest.capability(:docker_compose_installed, @config)
+          @machine.ui.detail(I18n.t(:getting_info))
+          machine_hardware_name, kernel_name = @machine.guest.capability(:docker_compose_get_info, @config)
+
+          @machine.ui.detail(I18n.t(:downloading, version: @config.compose_version, kernel: kernel_name, machine: machine_hardware_name))
+          url = "https://github.com/docker/compose/releases/download/#{@config.compose_version}/docker-compose-#{kernel_name}-#{machine_hardware_name}"
+          remote_tmp_path = nil
+          Dir.mktmpdir do |local_tmp_dir|
+            local_tmp_path = File.join(local_tmp_dir, "docker-compose")
+            File.open(local_tmp_path, "w") do |f|
+              contents = fetch_file(url)
+              f.write(contents)
+            end
+
+            @machine.ui.detail(I18n.t(:uploading, version: @config.compose_version))
+            remote_tmp_path = @machine.guest.capability(:docker_compose_upload, @config, local_tmp_path)
+          end
+
           @machine.ui.detail(I18n.t(:installing, version: @config.compose_version))
-          @machine.guest.capability(:docker_compose_install, @config)
+          @machine.guest.capability(:docker_compose_install, @config, remote_tmp_path)
 
           if !@machine.guest.capability(:docker_compose_installed, @config)
             raise DockerComposeError, :install_failed
@@ -23,6 +40,19 @@ module VagrantPlugins
 
         @machine.guest.capability(:docker_compose_set_project_name, @config)
       end
+
+      def fetch_file(url)
+        response = Net::HTTP.get_response(URI(url))
+        case response
+        when Net::HTTPSuccess then
+          return response.body
+        when Net::HTTPRedirection then
+          new_url = response['location']
+          return fetch_file(new_url)
+        else
+          raise "Error: unable to download docker-compose: #{url}"
+        end
+      end
     end
   end
 end

data/lib/vagrant-docker-compose/locales/en.yml

@@ -4,8 +4,11 @@ en:
     install_failed: Docker Compose installation failed
   not_supported_on_guest: Not supported on the guest operating system
   checking_installation: Checking for Docker Compose installation...
-  installing: Installing Docker Compose %{version}
-  symlinking: Symlinking Docker Compose %{version}
+  getting_info: Getting machine and kernel name from guest machine...
+  downloading: Downloading Docker Compose %{version} for %{kernel} %{machine}
+  uploading: Uploading Docker Compose %{version} to guest machine...
+  installing: Installing Docker Compose %{version} in guest machine...
+  symlinking: Symlinking Docker Compose %{version} in guest machine...
   docker_compose_up: Running docker-compose up...
   docker_compose_rm: Running docker-compose rm...
   docker_compose_build: Running docker-compose build...

data/lib/vagrant-docker-compose/plugin.rb

@@ -19,6 +19,16 @@ module VagrantPlugins
         Cap::Linux::DockerComposeInstalled
       end
 
+      guest_capability("linux", "docker_compose_get_info") do
+        require_relative "cap/linux/docker_compose_get_info"
+        Cap::Linux::DockerComposeGetInfo
+      end
+
+      guest_capability("linux", "docker_compose_upload") do
+        require_relative "cap/linux/docker_compose_upload"
+        Cap::Linux::DockerComposeUpload
+      end
+
       guest_capability("linux", "docker_compose_install") do
         require_relative "cap/linux/docker_compose_install"
         Cap::Linux::DockerComposeInstall

data/lib/vagrant-docker-compose/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerComposeProvisioner
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: 
@@ -21,6 +21,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- Vagrantfile
 - example/Vagrantfile
 - example/app/Dockerfile
 - example/app/index.html
@@ -28,10 +29,12 @@ files:
 - example/docker-compose-base.yml
 - example/docker-compose.yml
 - lib/vagrant-docker-compose.rb
+- lib/vagrant-docker-compose/cap/linux/docker_compose_get_info.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_install.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_installed.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_set_project_name.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_symlink.rb
+- lib/vagrant-docker-compose/cap/linux/docker_compose_upload.rb
 - lib/vagrant-docker-compose/config.rb
 - lib/vagrant-docker-compose/docker_compose.rb
 - lib/vagrant-docker-compose/errors/docker_compose_error.rb