vagrant-lxd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f520f19dbe7785aae63572ae288e858e8cb1752
-  data.tar.gz: 36579c91dc77ca0b0cd969af53e2fc7e25586add
+  metadata.gz: 654ad77a94d17f40d4f528b4e3b3c9240e6da694
+  data.tar.gz: f61890ef2aaa6f42d2df0c50c17d8d3e4aa6a976
 SHA512:
-  metadata.gz: 0e4bd0c5fa78d6d87efd722b2486852290367d41f60c706b2cba4d242cff1d0432dc3fd7383d1da600dd2f923191fa8ec4cac14e3acc3eca4925643badbd9356
-  data.tar.gz: c5a7e42a14dd8b1610d2c82c9227c2bc05cbbbc5f4489c6776d62f95d383824083cfea7ef928424d4d84b47ed42b9941fa670e1c8dfc832443de2d456f022e38
+  metadata.gz: 88d1f8cf94ebbdc2f06746ea8125339cad299de715b757fa8204ebebe1f72606d2e7ad9860f24a5e12f96a2a97a43696c77fa1594e0f05ec7804f746b0e784d7
+  data.tar.gz: 53ffb9cb0d78df23a42d2f5a10915f7a919609dc75ec39569b69b71f62f05e69739a5abca8049ee9ebe101f4612edc58e85a40494f57dfa0eb43fb1427f903bb

data/Gemfile.lock

@@ -1,20 +1,24 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 04f7215b5e3f594368696262920deaf631315e37
+  revision: 45766ad00e5567fe6706a84fe07ba922b442dc34
   specs:
-    vagrant (2.1.3.dev)
+    vagrant (2.2.2.dev)
+      bcrypt_pbkdf (~> 1.0.0)
       childprocess (~> 0.6.0)
+      ed25519 (~> 1.2.4)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
-      i18n (>= 0.6.0, <= 0.8.0)
+      i18n (~> 1.1.1)
       listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 4.2.0)
+      net-ssh (~> 5.0.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
+      rubyzip (~> 1.2.2)
+      vagrant_cloud (~> 2.0.0)
       wdm (~> 0.1.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
@@ -23,28 +27,31 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.3.0)
-      hyperkit (~> 1.1.0)
+    vagrant-lxd (0.3.1)
+      hyperkit (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    bcrypt_pbkdf (1.0.0)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.1.3)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
+    ed25519 (1.2.4)
     erubis (2.7.0)
-    fakefs (0.14.2)
-    faraday (0.15.2)
+    fakefs (0.18.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     gssapi (1.2.0)
@@ -55,10 +62,11 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    hyperkit (1.1.0)
-      activesupport (~> 4.2.6)
+    hyperkit (1.2.0)
+      activesupport (>= 4.2.6)
       sawyer
-    i18n (0.8.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -68,9 +76,9 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
@@ -78,10 +86,10 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-ssh (5.0.2)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -92,25 +100,25 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -120,8 +128,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    vagrant_cloud (2.0.1)
+      rest-client (~> 2.0.2)
     wdm (0.1.1)
-    winrm (2.2.3)
+    winrm (2.3.0)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -133,7 +143,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.0)
+    winrm-fs (1.3.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -152,4 +162,4 @@ DEPENDENCIES
   vagrant-lxd!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/README.md

@@ -99,9 +99,21 @@ host machine's subuid(5) and subgid(5) files:
     $ echo root:$(id -g):1 | sudo tee -a /etc/subgid
 
 For more information about these commands, and user/group ID mapping in
-general, we recommend [this article][1].
+general, we recommend [this article][custom-user-mappings].
 
-[1]: https://insights.ubuntu.com/2017/06/15/custom-user-mappings-in-lxd-containers/
+[custom-user-mappings]: https://insights.ubuntu.com/2017/06/15/custom-user-mappings-in-lxd-containers/
+
+#### Changing the Guest User ID
+
+When setting up shared folders, this plugin assumes that the UID and GID
+of the vagrant user in the guest machine are both `1000`. If you're
+using a non-standard box where these are different, you can override
+the default with the `vagrant_uid` and `vagrant_gid` settings.
+
+    config.vm.provider 'lxd' do |lxd|
+      lxd.vagrant_uid = 500
+      lxd.vagrand_gid = 1000 # defaults to vagrant_uid
+    end
 
 ### Shared LXD Containers
 
@@ -134,10 +146,10 @@ following setting in your Vagrantfile:
   config.vm.insert_key = false
 ```
 
-Refer to Vagrant's [documentation][1] for more information about this
-setting.
+Refer to Vagrant's [documentation][ssh_settings] for more information
+about this setting.
 
-[1]: https://www.vagrantup.com/docs/vagrantfile/ssh_settings.html
+[ssh_settings]: https://www.vagrantup.com/docs/vagrantfile/ssh_settings.html#config-ssh-insert_key
 
 ### Nested Containers
 

data/lib/vagrant-lxd/action.rb

@@ -139,11 +139,11 @@ module VagrantLXD
               c.use HandleBox
               c.use CheckForSyncedFolderSupport
               c.use LXD.action(:create)
+              c.use Provision
               c.use LXD.action(:resume)
               c.use SetHostname
               c.use SyncedFolders
               c.use WaitForCommunicator
-              c.use Provision
             when :running
               c.use Message, :info, 'Machine is already running.'
             when :frozen, :stopped
@@ -223,11 +223,11 @@ module VagrantLXD
               c.use Message, :info, 'Resuming machine...'
               c.use CheckForSyncedFolderSupport
               c.use LXD.action(:configure)
+              c.use Provision
               c.use LXD.action(:resume)
               c.use SetHostname
               c.use SyncedFolders
               c.use WaitForCommunicator
-              c.use Provision
             else
               c.use Message, :error, "Machine cannot be resumed while #{env[:machine_state]}."
             end

data/lib/vagrant-lxd/config.rb

@@ -30,8 +30,8 @@ module VagrantLXD
     attr_accessor :nesting
     attr_accessor :privileged
     attr_accessor :profiles
-
-    VAGRANT_UID = 1000 # TODO Make this configurable.
+    attr_accessor :vagrant_uid
+    attr_accessor :vagrant_gid
 
     def initialize
       @name = UNSET_VALUE
@@ -43,6 +43,8 @@ module VagrantLXD
       @ephemeral = UNSET_VALUE
       @profiles = UNSET_VALUE
       @api_endpoint = UNSET_VALUE
+      @vagrant_uid = UNSET_VALUE
+      @vagrant_gid = UNSET_VALUE
     end
 
     def validate(machine)
@@ -100,6 +102,14 @@ module VagrantLXD
         errors << "Invalid `profiles' (value must be an array of strings): #{profiles.inspect}"
       end
 
+      unless vagrant_uid.is_a? Integer and vagrant_uid >= 0
+        errors << "Invalid `vagrant_uid' (value must be a non-negative integer): #{vagrant_uid.inspect}"
+      end
+
+      unless vagrant_gid.is_a? Integer and vagrant_gid >= 0
+        errors << "Invalid `vagrant_gid' (value must be a non-negative integer): #{vagrant_gid.inspect}"
+      end
+
       { Version::NAME => errors }
     end
 
@@ -141,6 +151,14 @@ module VagrantLXD
       else
         @api_endpoint = URI(api_endpoint)
       end
+
+      if vagrant_uid == UNSET_VALUE
+        @vagrant_uid = 1000
+      end
+
+      if vagrant_gid == UNSET_VALUE
+        @vagrant_gid = vagrant_uid
+      end
     end
   end
 end

data/lib/vagrant-lxd/driver.rb

@@ -31,6 +31,8 @@ module VagrantLXD
 
     USER_AGENT = "#{Version::DESCRIPTION} #{Version::VERSION} (#{Hyperkit::Default.user_agent})"
 
+    IMAGE_PROPERTIES = { description: "#{Version::DESCRIPTION} #{Version::VERSION}" }
+
     class OperationTimeout < Vagrant::Errors::VagrantError
       error_key 'lxd_operation_timeout'
     end
@@ -101,6 +103,8 @@ module VagrantLXD
     attr_reader :nesting
     attr_reader :privileged
     attr_reader :profiles
+    attr_reader :vagrant_uid
+    attr_reader :vagrant_gid
 
     def initialize(machine)
       @machine = machine
@@ -113,6 +117,8 @@ module VagrantLXD
       @ephemeral = machine.provider_config.ephemeral
       @profiles = machine.provider_config.profiles
       @name = machine.provider_config.name
+      @vagrant_uid = machine.provider_config.vagrant_uid
+      @vagrant_gid = machine.provider_config.vagrant_gid
       @logger = Log4r::Logger.new('vagrant::lxd::driver')
       @lxd = Hyperkit::Client.new(api_endpoint: api_endpoint.to_s, verify_ssl: false, user_agent: USER_AGENT)
     end
@@ -127,8 +133,8 @@ module VagrantLXD
       raw_idmap = container[:config][:'raw.idmap']
       begin
         raw_idmap and
-        raw_idmap =~ /^uid #{Process.uid} #{Config::VAGRANT_UID}$/ and
-        raw_idmap =~ /^gid #{Process.gid} #{Config::VAGRANT_UID}$/
+        raw_idmap =~ /^uid #{Process.uid} #{vagrant_uid}$/ and
+        raw_idmap =~ /^gid #{Process.gid} #{vagrant_gid}$/
       end
     rescue Vagrant::Errors::ProviderNotUsable
       false
@@ -225,9 +231,13 @@ module VagrantLXD
           @logger.debug 'Using image: ' << image.inspect
         rescue Hyperkit::NotFound
           image = @lxd.create_image_from_file(file)
-          image_alias = @lxd.create_image_alias(fingerprint, machine_id)
           @logger.debug 'Created image: ' << image.inspect
-          @logger.debug 'Created image alias: ' << image_alias.inspect
+          begin
+            @lxd.update_image(fingerprint, properties: IMAGE_PROPERTIES)
+            @lxd.create_image_alias(fingerprint, machine_id, IMAGE_PROPERTIES)
+          rescue Hyperkit::Error
+            @logger.error 'Failed to set description for image: ' << e.reason
+          end
         end
 
         container = @lxd.create_container(machine_id, ephemeral: ephemeral, fingerprint: fingerprint, config: config, profiles: profiles)
@@ -417,8 +427,8 @@ module VagrantLXD
         # Manually specified, carry on.
       elsif @machine.env.host.capability(:synced_folders)
         config[:'raw.idmap'] = ''
-        config[:'raw.idmap'] << "uid #{Process.uid} #{Config::VAGRANT_UID}\n"
-        config[:'raw.idmap'] << "gid #{Process.gid} #{Config::VAGRANT_UID}\n"
+        config[:'raw.idmap'] << "uid #{Process.uid} #{vagrant_uid}\n"
+        config[:'raw.idmap'] << "gid #{Process.gid} #{vagrant_gid}\n"
       end
 
       @logger.debug 'Resulting configuration: ' << config.inspect

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

data/vagrant-lxd.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.add_runtime_dependency 'hyperkit', '~> 1.1.0'
+  spec.add_runtime_dependency 'hyperkit', '~> 1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 description: A Vagrant plugin that allows management of containers using LXD.
 email:
 - evanh@catalyst.net.nz