lux 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9843ad34c05fb99fad76b64a4d253a45288127bf
-  data.tar.gz: aeaf2355718efc7150069bd2bf41c104a93f52c3
+  metadata.gz: 639838cccfb8448235e88cd2340793420e8f74fd
+  data.tar.gz: 6acb8621150b1aa51282c77f574eed528d39b857
 SHA512:
-  metadata.gz: b769fa43ac9c6e68ecfd4ba3df1a9b14ccf2ac8004809836d4420b4f4f079d05a39a3d431a1f30f6337c8f984e42b7bf2b04b4cd2b08194a03ff4262173776c0
-  data.tar.gz: be2293b63019cfb17fad5428e98a9abfe06ec33283d2513812c1992677add4cbdccf3d30966dfbafe58523d25aaba1fae6e021305d2a6639aa504f62b6d781f5
+  metadata.gz: 116791a3eaab4695654f4a7a755614a38fc8610b715b1750d49eaaa8e96af31ed1d8c92742400f8ca1b1981fb750e63dc75d466e70681c900cc1b5cfb27827d8
+  data.tar.gz: dc88cdcbaa23d2d3c02f23610709cae44714a2ad518850e548ac182b7a7cc76286b5dea5e0e1baa3921ca08afff4940fcf64e143a7e6a482b12c5dc5278ea378

data/CHANGELOG

@@ -1,3 +1,11 @@
+lux (1.1.4)
+
+ * Added --priv option to start and --exec
+ * Use Ruby to detect uid, rather than home directory mount which fails with
+   Docker for MacOS
+
+ -- Nick Townsend <nick.townsend@mac.com>  Wed, 10 May 2017 14:11:43 -0800
+
 lux (1.1.3)
 
  * Missed another &.

data/lib/lux.rb

@@ -72,11 +72,11 @@ module Lux
   # Return two elements:
   # - user name (defaults to current user), and
   # - a bash script setup command
+  # Omit the secret password: -p $1$Ih5pLngr$/boiJHqKbQm9AP/QQyq0b1
   #
   def user_setup_cmd user = `id -nu`.strip
     [user, <<-COMMAND.gsub(/^\s*/,'').gsub(/\n/,' ; ')]
-      uid=$(echo $(stat -c %u:%g #{ENV['HOME']}) | cut -d: -f2)
-      useradd -M -d #{ENV['HOME']} -u $uid -s #{ENV['SHELL']} #{user}
+      useradd -M -d #{ENV['HOME']} -u #{Process.uid} -s #{ENV['SHELL']} #{user}
       mkdir -p /etc/sudoers.d
       echo "#{user} ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/#{user}
     COMMAND

data/lib/lux/app.rb

@@ -57,6 +57,7 @@ class Lux::App < Thor
   method_option :env, type: :string, aliases: '-e', desc: 'Path to environment file'
   method_option :name, type: :string, aliases: '-n', default: '<autogenerated>', desc: 'Docker container name'
   method_option :port, type: :string, aliases: '-p', default: nil, desc: 'Expose ports (default all)'
+  method_option :priv, type: :boolean, default: false, desc: 'Run in privileged mode (default false)'
   def start(image)
     image = Lux.findimage image
     raise "no image" if image.empty?
@@ -64,12 +65,13 @@ class Lux::App < Thor
     me, setup_cmd = Lux.user_setup_cmd()
     args = ["-v #{ENV['HOME']}:#{ENV['HOME']}"]
     args << "--env-file=#{options.env}" if options.env
+    args << "--privileged" if options.priv
     args << "--name=#{options.name}" unless options.name == '<autogenerated>'
     args << (options.port ? "-p #{options.port}" : "-P")
     cid = `docker run -dit #{args.join(' ')} #{image} /bin/bash`.strip
     Lux.die "Container failed to start" unless cid =~ /^[a-z0-9]+$/
     system "docker exec #{cid} bash -c #{setup_cmd.shellescape}"
-    puts "Type 'su [-] #{me}' then hit enter to attach to the container as yourself:"
+    puts "Your user and home directory are mapped into the container: Hit Enter then use 'su [-] #{me}'"
     Kernel.exec "docker attach #{cid}"
   end
 
@@ -80,6 +82,7 @@ class Lux::App < Thor
 
   desc "exec IMAGE COMMAND", "Run a command inside a Docker container"
   method_option :env, type: :string, aliases: '-e', desc: 'Path to environment file'
+  method_option :priv, type: :boolean, default: false, desc: 'Run in privileged mode (default false)'
   def exec(image, *command)
     image = Lux.findimage image
     me, setup_cmd = user_setup_cmd
@@ -89,6 +92,7 @@ class Lux::App < Thor
     env += IO.readlines(options.env).grep(/^(?!#)/).map(&:rstrip) if options.env
     cmd = setup_cmd + "su - #{me} -c 'cd #{relwd}; env -i #{env.join(' ')} #{command.join(' ')}'"
     args = ["-v #{ENV['HOME']}:#{ENV['HOME']}"]
+    args += "--privileged" if options.priv
     system "docker run --rm #{args.join(' ')} #{image} /bin/bash -c #{cmd.shellescape}"
   end
 

data/lib/lux/version.rb

@@ -1,3 +1,3 @@
 module Lux
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Handy utilities for working with Docker