kontena-cli 1.1.0.pre1 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa4fdfff0c1b90c0954ec7e31f8f916c8636f16
-  data.tar.gz: 62e78df6ba2b65b1bfcaacde2290d81719d93e82
+  metadata.gz: 8e7c1e0f1f4b7150cbb38ae75bd31b5d9c011018
+  data.tar.gz: 105cd534097a4479c050b0ca174014c61b327677
 SHA512:
-  metadata.gz: e2fb585c59f687236071ec28640e487f32e4b4a1426ef9152249bcdd0651dfb96d0250b1ec91df171e9c0c1b650c257c9bb0e9f2039d8fda9b5a553ddda9c55f
-  data.tar.gz: 7408e60150cbd48e54549a490af795bb6688af0e01c9969f2f53a20fb8b59417228b3d1fc798e877377a39d28540c9ba8c614a99be110ae86bc74bf07c60716a
+  metadata.gz: c8fb7ead66ba6c861d79544f3955b13eadf8e3ceab55fbf3f3a1c108f7bcf23730ee97fccec1cf74b5d2ea8239af9eeb5ac6453b5892eb4b60ddbeda4392d9de
+  data.tar.gz: 27978ab4aea44afadff0f59119b993771e36ef3fc4a8688e15d88d3a3cf54525600d70b4d8b5c566790063f8b5a603a25d1a782c0eac8ea81c70805faf2299b1

data/Dockerfile

@@ -8,14 +8,8 @@ RUN apk update && \
   apk --update add ruby ruby-json ruby-bigdecimal ruby-io-console \
   ca-certificates libssl1.0 openssl libstdc++ && \
   gem install kontena-cli --no-rdoc --no-ri -v ${CLI_VERSION} && \
-  adduser kontena -D -h /home/kontena -s /bin/sh && \
-  echo "gem: --user-install" > /home/kontena/.gemrc && \
-  chown -R kontena.kontena /home/kontena && \
-  chmod +sx /usr/local/bin/docker
+  chmod +x /usr/local/bin/docker
 
-ENV PATH=$PATH:/home/kontena/.gem/ruby/2.3.0/bin
-
-VOLUME ["/home/kontena"]
-WORKDIR /home/kontena
-USER kontena
+VOLUME ["/root"]
+WORKDIR /root
 ENTRYPOINT ["/usr/bin/kontena"]

data/README.md

@@ -4,7 +4,7 @@
 This is a command line tool for [Kontena](http://www.kontena.io).
 
 ## Installation
-> Prerequisities: [Ruby](https://www.ruby-lang.org/en/)
+> Prerequisities: [Ruby](https://www.ruby-lang.org/en/) version 2.1.0 or greater.
 
 Install it yourself as:
 

data/VERSION

@@ -1 +1 @@
-1.1.0.pre1
+1.1.0.rc1

data/examples/kontena-plugin-hello/kontena-plugin-hello.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
+  spec.add_runtime_dependency 'kontena-cli', '>= 1.0.0.pre2'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/kontena-cli.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "~> 1.5.3"
+  spec.add_runtime_dependency "opto", "~> 1.8.0"
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
+  spec.add_runtime_dependency "liquid", "~> 4.0.0"
 end

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -25,7 +25,7 @@ module Kontena::Cli::Cloud::Master
 
     def register(name, url = nil, provider = nil, redirect_uri = nil, version = nil, owner = nil)
       attributes = {}
-      attributes['name']         = name 
+      attributes['name']         = name
       attributes['url']          = url if url
       attributes['provider']     = provider if provider
       attributes['redirect-uri'] = redirect_uri if redirect_uri
@@ -107,7 +107,7 @@ module Kontena::Cli::Cloud::Master
         end
       else
         response = spinner "Registering current Kontena Master '#{current_master.name}' #{" as '#{new_name}' " unless new_name == current_master.name}to Kontena Cloud" do
-          register(new_name, current_master.url, self.provider, nil, self.version)
+          register(new_name, current_master.url, self.provider, current_master.url.gsub(/\/$/, '') + "/cb", self.version)
         end
       end
 

data/lib/kontena/cli/grids/common.rb

@@ -8,6 +8,10 @@ module Kontena::Cli::Grids
       puts "#{grid['name']}:"
       puts "  uri: #{host.sub('http', 'ws')}"
       puts "  initial_size: #{grid['initial_size']}"
+      puts "  default_affinity: "
+      grid['default_affinity'].to_a.each do |a|
+        puts "    - #{a}"
+      end
       root_dir = grid['engine_root_dir']
       nodes = client(require_token).get("grids/#{grid['name']}/nodes")
       nodes = nodes['nodes'].select{|n| n['connected'] == true }

data/lib/kontena/cli/grids/create_command.rb

@@ -10,6 +10,7 @@ module Kontena::Cli::Grids
     option "--initial-size", "INITIAL_SIZE", "Initial grid size (number of nodes)", default: 1
     option "--silent", :flag, "Reduce output verbosity"
     option "--token", "[TOKEN]", "Set grid token"
+    option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
 
     requires_current_master_token
 
@@ -18,7 +19,8 @@ module Kontena::Cli::Grids
         name: name
       }
       payload[:token] = self.token if self.token
-      payload[:initial_size] = initial_size if initial_size
+      payload[:initial_size] = self.initial_size if self.initial_size
+      payload[:default_affinity] = self.default_affinity_list unless self.default_affinity_list.empty?
       grid = nil
       if initial_size == 1
         warning "Option --initial-size=1 is only recommended for test/dev usage" unless running_silent?

data/lib/kontena/cli/grids/update_command.rb

@@ -7,6 +7,7 @@ module Kontena::Cli::Grids
 
     parameter "NAME", "Grid name"
     option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
+    option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
 
     def execute
       require_api_url
@@ -21,6 +22,9 @@ module Kontena::Cli::Grids
           }
         }
       end
+      if default_affinity_list
+        payload[:default_affinity] = default_affinity_list
+      end
       client(token).put("grids/#{name}", payload)
     end
   end

data/lib/kontena/cli/master/config/get_command.rb

@@ -12,9 +12,13 @@ module Kontena::Cli::Master::Config
 
     option ['-p', '--pair'], :flag, "Print key=value instead of only value"
 
+    option '--return', :flag, "Return the value", hidden: true
+
     def execute
       if self.pair?
         puts client.get("config/#{self.key}").inspect
+      elsif self.return?
+        return client.get("config/#{self.key}")[self.key]
       else
         puts client.get("config/#{self.key}")[self.key]
       end

data/lib/kontena/cli/master/remove_command.rb

@@ -6,7 +6,7 @@ module Kontena::Cli::Master
 
     banner "Note: This command only removes the master from your local configuration file"
 
-    option '--force', :flag, "Don't ask questions"
+    option '--force', :flag, "Don't ask for confirmation", attribute_name: :forced
 
     def run_interactive
       selections = prompt.multi_select("Select masters to remove from configuration file:") do |menu|
@@ -22,19 +22,15 @@ module Kontena::Cli::Master
     end
 
     def delete_servers(servers)
-      case servers.size
-      when 0
-        abort "Master not found in configuration"
-      when 1
-        config.servers.delete(config.servers.delete(servers.first))
-        puts "Removed Master '#{servers.first.name}'"
-      else
-        unless self.force?
-          abort("Aborted") unless prompt.yes?("Remove #{servers.size} masters from configuration?")
-        end
-        config.servers.delete_if {|s| servers.include?(s) }
-        puts "Removed #{servers.size} masters from configuration"
+      abort "Master not found in configuration" if servers.empty?
+
+      unless forced?
+        puts "Removing #{servers.size} master#{"s" if servers.size > 1} from configuration"
+        confirm
       end
+
+      config.servers.delete_if {|s| servers.include?(s) }
+
       unless config.find_server(config.current_server)
         puts
         puts "Current master was removed, to select a new current master use:"
@@ -43,6 +39,7 @@ module Kontena::Cli::Master
         puts "  " + pastel.green.on_black("  kontena master login <master_url>  ")
         config.current_server = nil
       end
+
       config.write
     end
 

data/lib/kontena/cli/master/ssh_command.rb

@@ -0,0 +1,43 @@
+module Kontena::Cli::Master
+  class SshCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    parameter "[COMMANDS] ...", "Run command on host"
+
+    option ["-i", "--identity-file"], "IDENTITY_FILE", "Path to ssh private key"
+    option ["-u", "--user"], "USER", "Login as a user", default: "core"
+
+    requires_current_master
+
+    def master_host
+      require 'uri'
+      URI.parse(current_master.url).host
+    end
+
+    def master_provider
+      Kontena.run('master config get --return server.provider', returning: :result)
+    end
+
+    def execute
+
+      commands_list.insert('--') unless commands_list.empty?
+
+      if master_provider == 'vagrant'
+        unless Kontena::PluginManager.instance.plugins.find { |plugin| plugin.name == 'kontena-plugin-vagrant' }
+          exit_with_error 'You need to install vagrant plugin to ssh into this node. Use kontena plugin install vagrant'
+        end
+        cmd = ['vagrant', 'master', 'ssh']
+        cmd += commands_list
+        Kontena.run(cmd)
+      else
+        cmd = ['ssh']
+        cmd << "#{user}@#{master_host}"
+        cmd += ["-i", identity_file] if identity_file
+        cmd += commands_list
+        exec(*cmd)
+      end
+    end
+  end
+end
+

data/lib/kontena/cli/master_command.rb

@@ -11,6 +11,7 @@ require_relative 'master/join_command'
 require_relative 'master/audit_log_command'
 require_relative 'master/token_command'
 require_relative 'master/init_cloud_command'
+require_relative 'master/ssh_command'
 
 class Kontena::Cli::MasterCommand < Kontena::Command
   include Kontena::Util
@@ -27,6 +28,8 @@ class Kontena::Cli::MasterCommand < Kontena::Command
   subcommand "join", "Join Kontena Master using an invitation code", Kontena::Cli::Master::JoinCommand
   subcommand "audit-log", "Show master audit logs", Kontena::Cli::Master::AuditLogCommand
   subcommand "init-cloud", "Configure current master to use Kontena Cloud services", Kontena::Cli::Master::InitCloudCommand
+  subcommand "ssh", "Connect to the master via SSH", Kontena::Cli::Master::SshCommand
+
   if experimental?
     require_relative 'master/create_command'
     subcommand "create", "Install a new Kontena Master", Kontena::Cli::Master::CreateCommand

data/lib/kontena/cli/nodes/ssh_command.rb

@@ -4,28 +4,43 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::GridOptions
 
     parameter "NODE_ID", "Node id"
+    parameter "[COMMANDS] ...", "Run command on host"
+
     option ["-i", "--identity-file"], "IDENTITY_FILE", "Path to ssh private key"
     option ["-u", "--user"], "USER", "Login as a user", default: "core"
     option "--private-ip", :flag, "Connect to node's private IP address"
     option "--internal-ip", :flag, "Connect to node's internal IP address (requires VPN connection)"
 
+    requires_current_master
+    requires_current_grid
+
     def execute
-      require_api_url
-      require_current_grid
-      token = require_token
+      node = client.get("nodes/#{current_grid}/#{node_id}")
+
+      provider = Array(node["labels"]).find{ |l| l.start_with?('provider=')}.to_s.split('=').last
+
+      commands_list.insert('--') unless commands_list.empty?
 
-      node = client(token).get("nodes/#{current_grid}/#{node_id}")
-      cmd = ['ssh']
-      cmd << "-i #{identity_file}" if identity_file
-      if internal_ip?
-        ip = "10.81.0.#{node['node_number']}"
-      elsif private_ip?
-        ip = node['private_ip']
+      if provider == 'vagrant'
+        unless Kontena::PluginManager.instance.plugins.find { |plugin| plugin.name == 'kontena-plugin-vagrant' }
+          exit_with_error 'You need to install vagrant plugin to ssh into this node. Use kontena plugin install vagrant'
+        end
+        cmd = ['vagrant', 'node', 'ssh', node['name']] + commands_list
+        Kontena.run(cmd)
       else
-        ip = node['public_ip']
+        cmd = ['ssh']
+        cmd += ["-i", identity_file] if identity_file
+        if internal_ip?
+          ip = "10.81.0.#{node['node_number']}"
+        elsif private_ip?
+          ip = node['private_ip']
+        else
+          ip = node['public_ip']
+        end
+        cmd << "#{user}@#{ip}"
+        cmd += commands_list
+        exec(*cmd)
       end
-      cmd << "#{user}@#{ip}"
-      exec(cmd.join(" "))
     end
   end
 end

data/lib/kontena/cli/registry/create_command.rb

@@ -6,7 +6,7 @@ module Kontena::Cli::Registry
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Stacks::StacksHelper
 
-    REGISTRY_VERSION = '2.2'
+    REGISTRY_VERSION = '2.6.0'
 
     option '--node', 'NODE', 'Node name'
     option '--s3-bucket', 'S3_BUCKET', 'S3 bucket'

data/lib/kontena/cli/stack_command.rb

@@ -8,6 +8,7 @@ require_relative 'stacks/build_command'
 require_relative 'stacks/monitor_command'
 require_relative 'stacks/logs_command'
 require_relative 'stacks/registry_command'
+require_relative 'stacks/validate_command'
 
 class Kontena::Cli::StackCommand < Kontena::Command
 
@@ -21,6 +22,7 @@ class Kontena::Cli::StackCommand < Kontena::Command
   subcommand "monitor", "Monitor services in a stack", Kontena::Cli::Stacks::MonitorCommand
   subcommand "build", "Build images listed in a stack file and push them to an image registry", Kontena::Cli::Stacks::BuildCommand
   subcommand ["reg", "registry"], "Stack registry related commands", Kontena::Cli::Stacks::RegistryCommand
+  subcommand "validate", "Process and validate a stack file", Kontena::Cli::Stacks::ValidateCommand
 
   def execute
   end

data/lib/kontena/cli/stacks/build_command.rb

@@ -1,4 +1,5 @@
 require_relative 'common'
+require 'shellwords'
 
 module Kontena::Cli::Stacks
   class BuildCommand < Kontena::Command
@@ -8,14 +9,23 @@ module Kontena::Cli::Stacks
     banner "Build images listed in a stack file and push them to your image registry"
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+
     option ['--no-cache'], :flag, 'Do not use cache when building the image', default: false
     option ['--no-push'], :flag, 'Do not push images to registry', default: false
     option ['--no-pull'], :flag, 'Do not attempt to pull a newer version of the image', default: false
+    option ['--[no-]sudo'], :flag, 'Run docker using sudo', hidden: Kontena.on_windows?, environment_variable: 'KONTENA_SUDO', default: false
+
+    option ['-n', '--name'], 'NAME', 'Define stack name (by default comes from stack file)'
+    include Common::StackValuesFromOption
+
     parameter "[SERVICE] ...", "Services to build"
 
+    requires_current_master # the stack may use a vault resolver
+    requires_current_master_token
+
     def execute
       require_config_file(filename)
-      stack = stack_from_yaml(filename)
+      stack = stack_from_yaml(filename, name: name, values: values)
       services = stack['services']
 
       unless service_list.empty?
@@ -25,25 +35,23 @@ module Kontena::Cli::Stacks
       if services.none?{ |service| service['build'] }
         abort 'Not found any service with a build option'.colorize(:red)
       end
-      build_docker_images(services, no_cache?, no_pull?)
+      build_docker_images(services)
       push_docker_images(services) unless no_push?
     end
 
     # @param [Hash] services
-    # @param [Boolean] no_cache
-    # @param [Boolean] no_pull
-    def build_docker_images(services, no_cache = false, no_pull = false)
+    def build_docker_images(services)
       services.each do |service|
         if service['build']
           dockerfile = service['build']['dockerfile'] || 'Dockerfile'
-          abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
+          abort("'#{service['image']}' is not valid Docker image name") unless valid_image_name?(service['image'])
           abort("'#{service['build']['context']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build']['context'], dockerfile)
           if service['hooks'] && service['hooks']['pre_build']
             puts "Running pre_build hook".colorize(:cyan)
             run_pre_build_hook(service['hooks']['pre_build'])
           end
           puts "Building image #{service['image'].colorize(:cyan)}"
-          build_docker_image(service, no_cache, no_pull)
+          build_docker_image(service)
         end
       end
     end
@@ -59,16 +67,16 @@ module Kontena::Cli::Stacks
     end
 
     # @param [Hash] service
-    # @param [Boolean] no_cache
-    # @param [Boolean] no_pull
     # @return [Integer]
-    def build_docker_image(service, no_cache = false, no_pull = false)
+    def build_docker_image(service)
       dockerfile = dockerfile = service['build']['dockerfile'] || 'Dockerfile'
       build_context = service['build']['context']
       cmd = ['docker', 'build', '-t', service['image']]
       cmd << ['-f', File.join(File.expand_path(build_context), dockerfile)] if dockerfile != "Dockerfile"
-      cmd << '--no-cache' if no_cache
-      cmd << '--pull' unless no_pull
+      cmd << '--no-cache' if no_cache?
+      cmd << '--pull' unless no_pull?
+      cmd.unshift('sudo') if sudo?
+
       args = service['build']['args'] || {}
       args.each do |k, v|
         cmd << "--build-arg=#{k}=#{v}"
@@ -82,21 +90,17 @@ module Kontena::Cli::Stacks
     # @param [String] image
     # @return [Integer]
     def push_docker_image(image)
-      ret = system('docker', 'push', image)
+      cmd = ['docker', 'push', image]
+      cmd.unshift('sudo') if sudo?
+      ret = system(*cmd)
       raise ("Failed to push image #{image.colorize(:cyan)}") unless ret
       ret
     end
 
     # @param [String] name
     # @return [Boolean]
-    def validate_image_name(name)
-      !(/^[\w.\/\-:]+:?+[\w+.]+$/ =~ name).nil?
-    end
-
-    # @param [String] image
-    # @return [Boolean]
-    def image_exist?(image)
-      system("docker history '#{image}' >/dev/null 2>/dev/null")
+    def valid_image_name?(name)
+      !(/\A[\w.\/\-:]+:?+[\w+.]+\z/ =~ name).nil?
     end
 
     # @param [String] path