vagrant-communicator-docker 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4aea56e9f2b6c933234e8c76a9bde7721b897639ace97c9d8546d50343d2cd
-  data.tar.gz: d9bc70a8168645b609d1b5c9ba57e6059180d74969097f1b06bbf0e934741c4f
+  metadata.gz: f7ef642fbce92f0ce6e2225ecac4660e3f906551d63b0021446dbdb596e8c840
+  data.tar.gz: 26a7589ad4ef448834bd3628e80b8c4dbca7abf4579ac8b7337bf00619e37248
 SHA512:
-  metadata.gz: c55d121aca3d826ffbe5f1b6c053a23b3843183056f2e6d9e47755a661d00338c2e35dbb54cc7c21797cb1c6127d6eeb66670a1bb1b2cca807c5944d7477a1c0
-  data.tar.gz: bd23c04708f136e37381e0ad0d10b7fadf1013188879c94b4111cc83dfe896a690fe512fce035376b72f5136ac7207174f4842ff91db3bdca35792ae7f8e5dc8
+  metadata.gz: 311e39e32e0ff405e5647c5512cd89b594df6121b3b52e8731e57fce4beb6f0bfa9699a0de14e5d91c4d3f572c5d9de3cd0832987ed7e0372d5aeffe9a1abd2d
+  data.tar.gz: 28a962afb2eeabe69a495e7c958e474cbd7f46e98831d08b0760f1450b08eae912ccbf7d4d9edc6412dbe171228fdc0faf8657c4232df6057cdae02bf5499210

data/README.md

@@ -9,13 +9,18 @@ have SSH - They do not.
 This communicator will make vagrant tasks that require SSH, interact with the docker instances, as if SSH exists, by 
 using the Docker API.
 
+Shell scripts used during provisioning will also be executed, so will facilitate provisioning shel scripts as well (from 1.0.8).
+Please note that these will always run as root inside the docker instance.
+
 This has only been used in a Linux environment.
 
 ## Requirements
 
-* Docker API gem: ```vagrant plugin install docker-api```
+* Docker API gem. Although set as a dependency for the communicator, you *must* install this as a vagrant plugin, else it will not be located to be used by vagrant.
 
-If you get an error noted as: ```undefined method `copy' for...``` please use : ```vagrant plugin install docker-api --plugin-version=1.34.2```
+```
+vagrant plugin install docker-api
+```
 
 ## Installation
 
@@ -27,12 +32,9 @@ vagrant plugin install vagrant-communicator-docker
 
 ### Manual install
 
-* fetch the built gem package located here: ```https://raw.githubusercontent.com/ProxiBlue/vagrant-communicator-docker/master/communicator-docker-1.0.6.gem```
-* install using: ```vagrant plugin install communicator-docker-1.0.6.gem```
+* install using: ```vagrant plugin install vagrant-communicator-docker-[version].gem```
+* install dependency ```vagrant plugin install docker-api``` (must be version 2.0.0 or greater)
 
-```
-curl https://raw.githubusercontent.com/ProxiBlue/vagrant-communicator-docker/master/communicator-docker-1.0.6.gem > communicator-docker-1.0.6.gem
-```
 
 ## Usage
 
@@ -58,10 +60,17 @@ config.vm.define "database", primary: false do |database|
     end
 ```
 
-## Limitations
+## Communication over TCP with remote Docker
+
+By default the communicator connects with Docker over a local socket. You can override this, and allow remote Docker connection by setting an environment variable:
+
+```DOCKER_HOST=tcp://[DOCKER HOST]:[PORT]```
+
+example:
+
+```DOCKER_HOST=tcp://127.0.0.1:2375``` vagrant up
 
-Communicates with a local docker service via linux sockets. That is all I need.
-Should be able to be extended to include a docker connection string to a tcp connection, but I have no need for that as yet, so not implemented.
+## Shell
 
 The default shell will be /bin/bash inside the docker container. You can override this using : ```vm.communicator.bash_shell = '/bin/sh';``` to use /bin/sh (or any other shell)
 

data/changelog.md

@@ -0,0 +1,13 @@
+## Changelog
+
+* 1.0.1: Initial public release
+* 1.0.2: Adjust how command is run via docker api exec call
+* 1.0.3: Add option to set shell to use
+* 1.0.4: Just a version bump to force a new build, no code adjustments
+* 1.0.5: Add shell_wait command to add delay for slow starting dockers
+* 1.0.6: Docker API update how command is run via API: https://github.com/swipely/docker-api/commit/425036dd85e41f8d4e6ea95ee6d001d76af9c7d7
+* 1.0.7: Change name to have 'vagrant-' prefix and push to rybygems
+* 1.0.8: Adjust so provisioning shell scripts get renamed to allow them to execute
+* 1.0.9: Add gemspec dependency
+* 1.1.10: Add stdout response from scripts running
+* 1.1.11: SOme more debug log messages

data/communicator-docker.gemspec

@@ -13,4 +13,5 @@ Gem::Specification.new do |s|
   s.require_paths   = ['lib']
   s.homepage        = 'https://github.com/ProxiBlue/vagrant-communicator-docker'
   s.license         = 'MIT'
+  s.add_dependency 'docker-api', '~> 2.0', '>= 2.0.0'
 end

data/lib/vagrant-communicator-docker/vagrant-communicator-docker.rb

@@ -31,6 +31,7 @@ module VagrantPlugins
             @container = Docker::Container.get(@machineID)
             @logger.debug(@container.json)
             # If we reached this point then we successfully connected
+            @logger.debug("DOCKER COMMUNICATOR connected to #{@machineID}")
             true
         rescue
             @logger.debug("DOCKER COMMUNICATOR - Could not make connection to #{@machineID}")
@@ -56,6 +57,7 @@ module VagrantPlugins
           end
         rescue Timeout::Error
           # We timed out, we failed.
+          @logger.debug("DOCKER COMMUNICATOR - Timeout to ready")
         end
 
         return false
@@ -89,8 +91,11 @@ module VagrantPlugins
       # @param [String] to Path of where to save the file on the remote
       #   machine.
       def upload(from, to)
-        @logger.debug("DOCKER COMMUNICATOR - upload from: #{from} to: #{to}")
+        to_folder = File.dirname(to)
+        from_filename = File.basename(from)
+        @logger.debug("DOCKER COMMUNICATOR - upload from: #{from} to: #{to_folder} from_filename: #{from_filename}")
         @container.archive_in(from, File.dirname(to), overwrite: true)
+        execute("mv #{to_folder}/#{from_filename} #{to}")
       end
 
       # Execute a command on the remote machine. The exact semantics
@@ -109,13 +114,20 @@ module VagrantPlugins
       # @return [Integer] Exit code of the command.
       def execute(command, opts=nil)
         begin
+            @logger.debug("DOCKER COMMUNICATOR - EXECUTE: #{command}")
             wait_for_ready(@machine.config.communicator.bash_wait)
-            result = @container.exec([@machine.config.communicator.bash_shell, '-c' , command], stderr: false)
+            @logger.debug("DOCKER COMMUNICATOR - Ready to EXECUTE")
+            result = @container.exec([@machine.config.communicator.bash_shell, '-c' , command], tty: true)
             @logger.debug(result)
-            @logger.debug(result.last)
+            if result.first.length > 0
+                result.first.first.each_line do |line|
+                    yield :stdout, line if block_given?
+                end
+            end
             return result.last
-        rescue
-            @logger.info("Error running command " + command + " on guest using shell #{@machine.config.communicator.bash_shell}")
+        rescue => e
+            @logger.info("DOCKER COMMUNICATOR: Error running command " + command + " on guest using shell #{@machine.config.communicator.bash_shell}")
+            @logger.error ([e.message]+e.backtrace).join($/)
         end
         return 255
       end
@@ -137,7 +149,7 @@ module VagrantPlugins
       #
       # @see #execute
       def test(command, opts=nil)
-        result = execute(command, opts)
+        result = execute(command)
         if result == 0
             return true
         end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantCommunicatorDocker
-      VERSION = '1.0.7'
+      VERSION = '1.0.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-communicator-docker
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - Lucas van Staden
@@ -9,7 +9,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-11-01 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Simulate SSH using Docket API when provisioning vagrant machines that
   use docker images without SSH
 email: sales@proxiblue.com.au
@@ -22,14 +42,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- communicator-docker-0.0.1.gem
-- communicator-docker-1.0.0.gem
-- communicator-docker-1.0.1.gem
-- communicator-docker-1.0.2.gem
-- communicator-docker-1.0.3.gem
-- communicator-docker-1.0.4.gem
-- communicator-docker-1.0.5.gem
-- communicator-docker-1.0.6.gem
+- changelog.md
 - communicator-docker.gemspec
 - lib/vagrant-communicator-docker.rb
 - lib/vagrant-communicator-docker/config.rb