dev_dock 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b863a98070f42c77a16db7816f22bc1cf8a82849c0d29a9feb1f4e29193583
-  data.tar.gz: b4814318af70abff9d9c26c3e8ff4851f209e9eec8cbd5ef1b9ad22834bf7f17
+  metadata.gz: 3d30cb024cdf2a1574e61edfa80aca988ab250b887bbfccccd054e677c3c8668
+  data.tar.gz: efb521c513bfcea2a8114ce3950fefb74485b575f2cb6374a3dcff40eb8bd23f
 SHA512:
-  metadata.gz: 219cafb0f2cf6fb87c8f7e5020e04f4c2ca67e678c7adcd6ea494197957a9d979eff3aee059e12afae5d27fb02d41e35926f28ec05bd986631e18bfa29c096fa
-  data.tar.gz: 240af4386462413ba3a062f9e654d1b18ed5609849d1dbf510553a9ca98b0222104018266a3dfeb4fefe6740be7f462a129037d47d70eb35cd2c740bb31c8cb7
+  metadata.gz: 41a0cdd302bf000090e75a0196baa85f7dea6e853c529e9c426441ca311024ee2281312c4b2221790153f408e54337729aa4a9155ce1b21c5bcfe436914212ec
+  data.tar.gz: 49e6451b4412a69dd51dee98ddc6d59224d0f8b2d36aba74ad50f45b0ea6f30940134b1045b90c35acc7fc6fb97bc441f1aa45f14eb435161194de5424577cf9

data/.gitignore

@@ -10,3 +10,5 @@
 /vendor
 # rspec failure tracking
 .rspec_status
+/typescript
+/.test-dir

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dev_dock (0.2.1)
+    dev_dock (0.3.0)
       docker-api (~> 1.34)
 
 GEM
@@ -41,4 +41,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/lib/dev_dock/binds.rb

@@ -0,0 +1,112 @@
+require 'fileutils'
+
+module DevDock
+
+  # binds are a type of mount which just map what is on the host into
+  # the container
+  class DevBind
+
+    attr_reader :source, :target, :permissions
+
+    def initialize(internal_volumes, source, target, permissions)
+      @internal_volumes = internal_volumes
+      @source = source
+      @target = target
+      @permissions = permissions
+    end
+
+    def exist?
+      File.exist?(@source)
+    end
+
+    def create
+      if not exist?
+        if not File.directory?(@source)
+          FileUtils.mkdir_p(File.dirname(@source))
+          FileUtils.touch(@source)
+        else
+          FileUtils.mkdir_p(@source)
+        end
+      end
+    end
+
+    def host_path
+      if @internal_volumes
+        internal, host = parent_volume
+        # just need to take out the part of the path which is internal, and
+        # replace it with the host volume.
+        relative = @source.slice(internal.length, @source.length)
+        if relative.length == 0
+          host
+        else
+          File.join(host, relative)
+        end
+      else
+        @source
+      end
+    end
+
+    def parent_volume
+      @internal_volumes.find { |internal, host| @source.index(internal) == 0 }
+    end
+
+    def to_argument
+      [host_path, @target, @permissions].compact.join(':')
+    end
+
+  end
+
+  class DevBinds
+
+    def initialize(list)
+      @internal_volumes = nil
+      @container = nil
+      @list = list
+    end
+
+    def internal_volumes
+      if container? and @internal_volumes.nil?
+        container_id = File.read('/proc/1/cgroup')
+          .lines
+          .find { |cgroup| cgroup.include?('docker') }
+          .split('/')
+          .last
+          .strip
+
+        container = Docker::Container.get(container_id)
+        @internal_volumes = container.json['Volumes']
+      end
+      @internal_volumes
+    end
+
+    def list
+      @list.map do |item|
+        source, target, permissions = item.split(':')
+        DevBind.new(internal_volumes, source, target, permissions)
+      end
+    end
+
+    def push(item)
+      @list.push(item)
+    end
+
+    # check if we're currently running inside of a container
+    def container?
+      if @container.nil?
+        if File.exist?('/proc/1/cgroup')
+          @container = File.read('/proc/1/cgroup').include?('docker')
+        else
+          @container = false
+        end
+      end
+      @container
+    end
+
+    def create
+      list.each do |bind|
+        bind.create
+      end
+    end
+
+  end
+end

data/lib/dev_dock/container.rb

@@ -1,4 +1,5 @@
 require 'docker'
+require 'dev_dock/binds'
 require 'dev_dock/util'
 require 'dev_dock/image'
 require 'dev_dock/volumes'
@@ -7,19 +8,35 @@ module DevDock
 
   class DevContainer
 
+    attr_reader :image, :volumes, :binds
+
     def initialize(options)
       @options = options
       @image = DevDock::DevImage.new(options.image_name)
       @volumes = DevDock::DevVolumes.new(@image)
+      @binds = DevDock::DevBinds.new([
+        '/var/run/docker.sock:/var/run/docker.sock'
+      ])
       @name = DevDock::Util::snake_case("dev_dock_#{options.image_name}")
-    end
 
-    def image
-      @image
+      init_binds
     end
 
-    def volumes
-      @volumes
+    def init_binds
+
+      ['workspaces', '.gitconfig', '.ssh'].each do |directory|
+        source = File.join(ENV['HOME'], directory)
+        target = File.join("/home", @image.user, directory)
+        @binds.push("#{source}:#{target}")
+      end
+
+      if x11?
+        @binds.push('/tmp/.X11-unix:/tmp/.X11-unix:ro')
+      end
+
+      if linux?
+        @binds.push( '/etc/localhost:/etc/localhost:ro')
+      end
     end
 
     def docker_group
@@ -49,11 +66,17 @@ module DevDock
       Docker::Container.get(@name).kill		
     end
 
+    def x11?
+      File.exists?('/tmp/.X11-unix')
+    end
+
+    def linux?
+      RUBY_PLATFORM.start_with?("x86_64-linux")
+    end
+
     def enable_x11(arguments)
-      if File.exist? '/tmp/.X11-unix'
+      if x11?
         Log::debug('X11 socket file found')
-        arguments.push '-v'
-        arguments.push '/tmp/.X11-unix:/tmp/.X11-unix:ro'
         arguments.push '-e'
         arguments.push 'DISPLAY'
       else
@@ -75,16 +98,11 @@ module DevDock
         'ctrl-q,ctrl-q',
         '-e', 'GH_USER',
         '-e', 'GH_PASS',
-        '-v', '/run/docker.sock:/var/run/docker.sock'
+        '-e', "DEV_DOCK_HOST_HOME=#{@options.host_home}"
       ]
 
-      ['workspaces', '.gitconfig', '.ssh'].each do |directory|
-        arguments.push '-v', "#{ENV['HOME']}/#{directory}:/home/#{@image.user}/#{directory}"
-      end
-
-      if RUBY_PLATFORM.start_with?("x86_64-linux")
+      if linux?
         enable_x11(arguments)
-        arguments.push '-v', '/etc/localhost:/etc/localhost:ro'
       end
 
       @volumes.list.each do |volume|
@@ -95,6 +113,10 @@ module DevDock
         arguments.push '-v', volume
       end
 
+      @binds.list.each do |bind|
+        arguments.push '-v', bind.to_argument
+      end
+
       @options.environment.each do |environment|
         arguments.push '-e', environment
       end

data/lib/dev_dock/options.rb

@@ -7,12 +7,16 @@ module DevDock
 
   class Options
 
+    attr_reader :run_command, :subcommand, :error, :volumes, :image_name, :environment,
+      :host_home
+
     def initialize(argv)
       @volumes = []
       @environment = []
       @subcommand = nil
       @error = nil
       @image_name = nil
+      @host_home = nil
       @argv = argv
       @run_command = ['tmux', 'new']
     end
@@ -28,6 +32,11 @@ module DevDock
         end
       end
 
+      parse_env
+    end
+
+    def parse_env
+      @host_home = ENV['DEV_DOCK_HOST_HOME'] || ENV['HOME']
     end
 
     def parse_end
@@ -77,8 +86,6 @@ module DevDock
       end
     end
 
-    attr_reader :run_command, :subcommand, :error, :volumes, :image_name, :environment
-
     def inspect
       "Subcommand: #{@subcommand}, Image: #{@image_name}, Volumes: #{@volumes}, Environment: #{@environment}, Run Command: #{@run_command}"
     end

data/lib/dev_dock/version.rb

@@ -1,3 +1,3 @@
 module DevDock
-  VERSION = "0.2.1"
+	VERSION = "0.3.0"
 end

data/lib/dev_dock/volumes.rb

@@ -26,7 +26,7 @@ module DevDock
     def exist?
       volumes = Docker::Util.parse_json(Docker.connection.get('/volumes'))["Volumes"]
       Log::debug("Volumes in docker: #{volumes}")
-      volumes.any? { |volume| volume['Name'] == @name }
+      not volumes.nil? and volumes.any? { |volume| volume['Name'] == @name }
     end
 
     # creates the volume if it does not exist

data/lib/dev_dock.rb

@@ -10,7 +10,9 @@ module DevDock
       Log::info('image does not exist, pulling')
       container.image.pull
     end
+
     container.volumes.create
+    container.binds.create
 
     container.run
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev_dock
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - AGhost-7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - dev_dock.gemspec
 - help.txt
 - lib/dev_dock.rb
+- lib/dev_dock/binds.rb
 - lib/dev_dock/container.rb
 - lib/dev_dock/image.rb
 - lib/dev_dock/log.rb