limepie-docker-host 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18db3a48956733893ddac3d6a8fd7cc5eb13b1da
-  data.tar.gz: 1b72f167e282769574d2070abf20672ac13c0924
+  metadata.gz: fd651ba91458e3e5c87c8790bf1924eba38bf642
+  data.tar.gz: 928750d8e4f142077fba12252f2f0c39c5557f02
 SHA512:
-  metadata.gz: 68d72dd707080daafc3971a1f93c24055a851f330da0e0718f47a0b30d33eea5230abc6041ffc68910cfa3526d88280c27d73f856a4e13f4b2ebdf7fed5c6a58
-  data.tar.gz: 26a35d64f7821d1b34ca60ae1f5c7a22246fb21b4d20e24f2f3f855263f69de30c66940bac8a878569a6e171a36cc1642907137b82a381e4ee36b04fdf86ddcf
+  metadata.gz: bcee30959cedefcc51032631564578408a2db02fde1e4ec4cd07a7f88c0be13765eb3fd437cc435c12f0f03f7d77693293fe430761439f6e821f6c398cef38e1
+  data.tar.gz: c394d55c14bc129ff74dac523371213a0b650274c651dbe63c97838cfa7884d94152f96827858a2adae8f4c67a118aa32fdb378cfa4427ffcd4a4d296950d32b

data/lib/limepie-docker-host/cap/linux/docker_compose_install.rb

@@ -21,6 +21,7 @@ module VagrantPlugins
                 end
               end
 
+              comm.sudo("rm -rf #{@config.install_path}")
               comm.sudo("curl -L https://github.com/docker/compose/releases/download/#{@config.compose_version}/docker-compose-`uname -s`-`uname -m` > #{@config.install_path}")
               comm.sudo("chmod +x #{@config.install_path}")
 

data/lib/limepie-docker-host/config.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
         up: "-d"
       }
 
-      attr_accessor :timeout, :yml, :rebuild, :project_name, :install_path, :compose_version, :options, :command_options
+      attr_accessor :project_name, :timeout, :yml, :project_name, :install_path, :compose_version, :options, :command_options, :subnet, :prefix, :command
 
       def yml=(yml)
         files = yml.is_a?(Array) ? yml : [yml]
@@ -18,21 +18,28 @@ module VagrantPlugins
 
       def initialize
         @project_name = UNSET_VALUE
+        @timeout = UNSET_VALUE
         @compose_version = UNSET_VALUE
         @install_path = UNSET_VALUE
         @options = UNSET_VALUE
         @command_options = UNSET_VALUE
-        @timeout = UNSET_VALUE
+        @subnet = UNSET_VALUE
       end
 
       def finalize!
-        if @timeout == UNSET_VALUE
-            @timeout = nil
-        else
-            @timeout = "COMPOSE_HTTP_TIMEOUT=" + @timeout.to_s + " "
+
+        @project_name = 'project' if @project_name == UNSET_VALUE
+        @prefix = Array.new
+        if @timeout
+            @prefix.push("COMPOSE_HTTP_TIMEOUT=" + @timeout.to_s)
+        end
+        if @project_name
+            @prefix.push("COMPOSE_PROJECT_NAME=" + @project_name)
         end
+        @prefix = @prefix.join(" ")
 
-        @project_name = nil if @project_name == UNSET_VALUE
+        @command = ARGV[0]
+        @subnet = nil if @subnet == UNSET_VALUE
         @compose_version = 'latest' if @compose_version == UNSET_VALUE
         @install_path = nil if @install_path == UNSET_VALUE
         @options = nil if @options == UNSET_VALUE

data/lib/limepie-docker-host/docker_compose.rb

@@ -8,11 +8,30 @@ module VagrantPlugins
         @config = config
       end
 
+      def docker_compose
+
+        @prefix = Array.new
+
+        if @config.prefix
+            @prefix.push("#{@config.prefix}")
+        end
+
+        if @config.install_path
+            @prefix.push("#{@config.install_path}")
+        end
+        if @config.options
+            @prefix.push("#{@config.options}")
+        end
+
+        @prefix.join(" ")
+      end
+
       def build
         @machine.ui.detail(I18n.t(:docker_compose_build))
         @machine.communicate.tap do |comm|
-          command = "#{@config.timeout} #{@config.install_path} #{@config.options} #{cli_options_for_yml_file} build #{@config.command_options[:build]}";
+          command = "#{docker_compose} #{cli_options_for_yml_file} build #{@config.command_options[:build]}";
 
+          @machine.ui.detail command
           comm.sudo(command) do |type, data|
             handle_comm(type, data)
           end
@@ -22,8 +41,21 @@ module VagrantPlugins
       def rm
         @machine.ui.detail(I18n.t(:docker_compose_rm))
         @machine.communicate.tap do |comm|
-          command = "#{@config.timeout} #{@config.install_path} #{@config.options} #{cli_options_for_yml_file} rm #{@config.command_options[:rm]}"
+          command = "#{docker_compose} #{cli_options_for_yml_file} rm #{@config.command_options[:rm]}"
 
+          @machine.ui.detail command
+          comm.sudo(command) do |type, data|
+            handle_comm(type, data)
+          end
+        end
+      end
+
+      def down
+        @machine.ui.detail(I18n.t(:docker_compose_down))
+        @machine.communicate.tap do |comm|
+          command = "#{docker_compose} #{cli_options_for_yml_file} down #{@config.command_options[:down]}"
+
+          @machine.ui.detail command
           comm.sudo(command) do |type, data|
             handle_comm(type, data)
           end
@@ -33,8 +65,8 @@ module VagrantPlugins
       def up
         @machine.ui.detail(I18n.t(:docker_compose_up))
         @machine.communicate.tap do |comm|
-          command = "#{@config.timeout} #{@config.install_path} #{@config.options} #{cli_options_for_yml_file} up #{@config.command_options[:up]}"
-
+          command = "#{docker_compose} #{cli_options_for_yml_file} up #{@config.command_options[:up]}"
+          @machine.ui.detail command
           comm.sudo(command) do |type, data|
             handle_comm(type, data)
           end

data/lib/limepie-docker-host/docker_host.rb

@@ -1,5 +1,4 @@
-require 'yaml'
-require_relative 'libraries/deep_merge'
+
 module VagrantPlugins
     module DockerHostProvisioner
         class DockerHost
@@ -10,38 +9,6 @@ module VagrantPlugins
                 @config      = config
                 @@hosts_path = Vagrant::Util::Platform.windows? ? File.expand_path('system32/drivers/etc/hosts', ENV['windir']) : '/etc/hosts'
 
-                setEnv
-            end
-
-            def setEnv
-                thing = YAML.load_file('env.yml')
-
-                services = thing['services']
-                yaml = {
-                  "version" => "2",
-                  "networks" => {
-                      "default" => {
-                          "ipam" => {
-                              "config" => [
-                                  {"subnet" => "172.101.0.0/16"}
-                              ]
-                          }
-                      }
-                  },
-                  "services" => services
-                }
-
-                stages = thing['stages'];
-
-                stages.each do |stage_name, stage|
-                  tmp = yaml
-                  stage['services'].each do |service_name, service|
-                      tmp['services'][service_name] = tmp['services'][service_name].deep_merge(service)
-                  end
-
-                  @machine.ui.detail('create file docker-compose.%s.yml' % [stage_name])
-                  File.open('docker-compose.%s.yml' % [stage_name], 'w') {|f| f.write tmp.to_yaml }
-                end
             end
 
             def execute
@@ -61,7 +28,7 @@ module VagrantPlugins
                 uuid = @machine.id || @machine.config.hostsupdater.id
 
                 components = []
-                components << "docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}/{{json .Config.Env}}' \$(docker ps -aq)"
+                components << "docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}/{{json .Config.Env}}/{{.State.Status}}/{{index .Config.Labels \"com.docker.compose.project\"}}' \$(docker ps -q) | grep DOMAIN= | grep running | grep " + @config.project_name
                 command = components.join(" ")
 
                 @machine.communicate.sudo(command) do |type, data|
@@ -70,11 +37,16 @@ module VagrantPlugins
                     lists.each do |list|
 
                         tmp = list.split("/", 2)
-                        matches = tmp[1].match(/DOMAIN=([^"]+)"/)
+                        if tmp[1]
+
+                            matches = tmp[1].match(/DOMAIN=([^"]+)"/)
 
-                        if !matches.nil?
-                            if matches[1]
-                                host << tmp[0].ljust(20) + matches[1].ljust(60) + "#" + uuid
+                            if !matches.nil?
+                                if tmp[0].length > 1
+                                    if matches[1].length > 1
+                                        host << tmp[0].ljust(20) + matches[1].ljust(60) + "#" + uuid
+                                    end
+                                end
                             end
                         end
                     end
@@ -102,7 +74,7 @@ module VagrantPlugins
 
             def addRoute
                 components = []
-                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' share_default"
+                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' " + @config.project_name + "_default"
                 command = components.join(" ")
 
                 @machine.communicate.sudo(command) do |type, data|
@@ -124,7 +96,7 @@ module VagrantPlugins
 
             def removeHost
                 components = []
-                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' share_default"
+                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' " + @config.project_name + "_default"
                 command = components.join(" ")
 
                 @machine.communicate.sudo(command) do |type, data|
@@ -178,7 +150,7 @@ module VagrantPlugins
 
             def removeRoute
                 components = []
-                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' share_default"
+                components << "docker network inspect --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' " + @config.project_name + "_default"
                 command = components.join(" ")
 
                 @machine.communicate.sudo(command) do |type, data|

data/lib/limepie-docker-host/installer.rb

@@ -18,7 +18,6 @@ module VagrantPlugins
           end
         end
 
-        @machine.guest.capability(:docker_compose_set_project_name, @config)
       end
     end
   end

data/lib/limepie-docker-host/locales/en.yml

@@ -7,5 +7,6 @@ en:
   installing: Installing Docker Compose %{version}
   symlinking: Symlinking Docker Compose %{version}
   docker_compose_up: Running docker-compose up...
+  docker_compose_down: Running docker-compose down...
   docker_compose_rm: Running docker-compose rm...
   docker_compose_build: Running docker-compose build...

data/lib/limepie-docker-host/plugin.rb

@@ -39,11 +39,6 @@ module VagrantPlugins
         Cap::Linux::DockerComposeInstall
       end
 
-      guest_capability("linux", "docker_compose_set_project_name") do
-        require_relative "cap/linux/docker_compose_set_project_name"
-        Cap::Linux::DockerComposeSetProjectName
-      end
-
       provisioner(:docker_host) do
         require_relative "provisioner"
         Provisioner

data/lib/limepie-docker-host/provisioner.rb

@@ -3,45 +3,117 @@ require_relative "installer"
 require_relative "docker_compose"
 require_relative "docker_host"
 
+require 'yaml'
+require_relative 'libraries/deep_merge'
+
 module VagrantPlugins
   module DockerHostProvisioner
     class Provisioner < Vagrant.plugin("2", :provisioner)
-      def initialize(machine, config, installer = nil, docker_compose = nil)
-        super(machine, config)
+        def initialize(machine, config, installer = nil, docker_compose = nil)
+            super(machine, config)
 
-        @installer = installer || Installer.new(@machine, @config)
-        @docker_compose = docker_compose || DockerCompose.new(@machine, @config)
-      end
+            @installer = installer || Installer.new(@machine, @config)
+            @docker_compose = docker_compose || DockerCompose.new(@machine, @config)
+        end
 
-      def provision
-        @installer.ensure_installed
+        def setEnv
 
-        return unless @config.yml
+            if File.exist?('docker-compose.local.yml') && @config.command == "up"
 
+            else
+                conf = YAML.load_file('env.yml')
+                if conf['stages']
+                    stages = conf['stages'];
+                else
+                    stages = {
+                        "local" => {
+                            "services" => {}
+                        }
+                    }
+                end
 
-        if @config.rebuild
-          @docker_compose.rm
-          @docker_compose.build
-        end
+                stages.each do |stage_name, stage|
+                    services = conf['services']
+                    yaml = {
+                      "version" => "2",
+                      "services" => services
+                    }
 
-        @docker_compose.up
+                    if @config.subnet[:"#{stage_name}"]
+                        yaml['networks'] = {
+                            "default" => {
+                                "ipam" => {
+                                    "config" => [
+                                        {"subnet" => @config.subnet[:"#{stage_name}"]}
+                                    ]
+                                }
+                            }
+                        }
+                    else
+                        if conf['networks']
+                            yaml['networks'] = conf['networks']
+                        end
+                    end
 
-        a = DockerHost.new(@machine, @config)
-        a.execute
+                    tmp = yaml
+                    tmp['services'] = tmp['services'].deep_merge(stage['services'])
 
+                    tmp['services'].each do |service_name, service|
+                        if service['environment_from']
+                            service['environment_from'].each do |from_name, from|
 
+                                from.each do |env_name|
+                                    env_alias = env_name.split(':')
+                                    if env_alias[1]
+                                        tmp['services'][service_name]['environment'][env_alias[1]] = tmp['services'][from_name]['environment'][env_alias[0]];
+                                    else
+                                        tmp['services'][service_name]['environment'][name] = tmp['services'][env_alias[0]]['environment'][env_alias[0]];
+                                    end
+                                end
 
-      end
-            def xinitialize(machine, config, docker_host = nil)
-                super(machine, config)
+                            end
+                            service.delete('environment_from')
+                        end
+                    end
 
-                #@docker_host = docker_host || DockerHost.new(@machine, @config)
+                    @machine.ui.detail('create file docker-compose.%s.yml' % [stage_name])
+                    File.open('docker-compose.%s.yml' % [stage_name], 'w') {|f| f.write tmp.to_yaml }
+                end
             end
+        end
+
+        def provision
+
+
+            setEnv
+
+            @installer.ensure_installed
+
+            return unless @config.yml
 
-            def xprovision
-                #@docker_host.execute
+            case @config.command
+                when "reload"
+    #                if prev_project_name = project_name
+                        #prev_project down
+                        #network end
+    #                else
+
+    #                end
+                    @docker_compose.down
+                    @docker_compose.build
+                else
+              # do nothing
             end
+
+
+            @docker_compose.up
+
+            a = DockerHost.new(@machine, @config)
+            a.execute
+
+        end
+
+
     end
   end
 end
-

data/lib/limepie-docker-host/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module DockerHostProvisioner
-        VERSION = "1.0.3"
+        VERSION = "1.0.4"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: limepie-docker-host
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - yejune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for logging into docker.
 email: 
@@ -28,7 +28,6 @@ files:
 - lib/limepie-docker-host/action/remove_host.rb
 - lib/limepie-docker-host/cap/linux/docker_compose_install.rb
 - lib/limepie-docker-host/cap/linux/docker_compose_installed.rb
-- lib/limepie-docker-host/cap/linux/docker_compose_set_project_name.rb
 - lib/limepie-docker-host/config.rb
 - lib/limepie-docker-host/docker_compose.rb
 - lib/limepie-docker-host/docker_host.rb

data/lib/limepie-docker-host/cap/linux/docker_compose_set_project_name.rb

@@ -1,27 +0,0 @@
-module VagrantPlugins
-    module DockerHostProvisioner
-    module Cap
-      module Linux
-        module DockerComposeSetProjectName
-          ROOT_PROFILE_FILE_NAME = "~/.profile"
-          PROFILE_FILE_NAME = "~/.profile_limepie-docker-compose_compose-project-name"
-
-          def self.docker_compose_set_project_name(machine, config)
-            return if config.project_name.nil?
-            machine.communicate.tap do |comm|
-              export_command = "export COMPOSE_PROJECT_NAME='#{config.project_name}'"
-              export_injection_command = "echo \"#{export_command}\" > #{PROFILE_FILE_NAME}"
-              comm.execute(export_injection_command)
-              comm.sudo(export_injection_command)
-
-              source_command = "source #{PROFILE_FILE_NAME}"
-              source_injection_command = "if ! grep -q \"#{source_command}\" #{ROOT_PROFILE_FILE_NAME} ; then echo \"#{source_command}\" >> #{ROOT_PROFILE_FILE_NAME} ; fi"
-              comm.execute(source_injection_command)
-              comm.sudo(source_injection_command)
-            end
-          end
-        end
-      end
-    end
-  end
-end