kontena-cli 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d0e10fa18b709c1354a89d324619c7f68acaf9
-  data.tar.gz: 5915e5df8a85eae8626a0b7531b0ce0db76a1dbf
+  metadata.gz: 960104670b01a01904b3c6c59b8a34a54fa00d4b
+  data.tar.gz: 818f20aebc2d1774d80b631ccc8cb6c30e393a5e
 SHA512:
-  metadata.gz: 131645acde33c5569b7a44dd5471a1de4afd19fedc71dd3f689dded6a05dc2163d50394ce7d1cbde1a0c426d2265cc27990b06f709c005a7672cb0152f9f0bee
-  data.tar.gz: 3032517244f0ab4333cfa289aa736f46837829059a972c92b8debf75d5552cdfccc13a1ae72330bc132822d48e259810c828a1b6470ba20636fc0ef7382bcaa6
+  metadata.gz: 9f23afc68dbe36ff30c0f0f7e93ae6880f2dbd455ba357a9b7d58b3ca55683a325704fc650e0a984055ab2f4fff1a5bbc7268074c3e0c48de169974decf0c86e
+  data.tar.gz: f30c99956e19d094efa2e718c9607c8e58245211e1ad2f12d369e4ecf5f41e6f6dceeac651ef81174b64fc5d7b5290fdef5beeae0f64a0d9b0e1b7641aaabd9e

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.11.0

data/bin/kontena

@@ -33,6 +33,7 @@ require 'kontena/cli/external_registry_command'
 require 'kontena/cli/deploy_command'
 require 'kontena/cli/app_command'
 require 'kontena/cli/etcd_command'
+require 'kontena/cli/vault_command'
 require 'kontena/cli/version_command'
 
 class MainCommand < Clamp::Command
@@ -40,6 +41,7 @@ class MainCommand < Clamp::Command
   subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
   subcommand "app", "App specific commands", Kontena::Cli::AppCommand
   subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
+  subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
   subcommand "deploy", "Create and deploy multiple services from YAML file", Kontena::Cli::DeployCommand
   subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
   subcommand "master", "Master specific commands", Kontena::Cli::MasterCommand

data/kontena-cli.gemspec

@@ -18,6 +18,8 @@ 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.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency 'excon'

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

@@ -9,7 +9,8 @@ module Kontena::Cli::Apps
 
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
-    parameter "[SERVICE] ...", "Services to start"
+    option ['--no-cache'], :flag, 'Do not use cache when building the image', default: false
+    parameter "[SERVICE] ...", "Services to build"
 
     attr_reader :services, :service_prefix
 
@@ -17,7 +18,7 @@ module Kontena::Cli::Apps
       require_config_file(filename)
       @service_prefix = project_name || current_dir
       @services = load_services(filename, service_list, service_prefix)
-      process_docker_images(services, true)
+      process_docker_images(services, true, no_cache?)
     end
   end
 end

data/lib/kontena/cli/apps/deploy_command.rb

@@ -11,6 +11,7 @@ module Kontena::Cli::Apps
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['--no-build'], :flag, 'Don\'t build an image, even if it\'s missing', default: false
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+    option '--async', :flag, 'Run deploys async/parallel'
 
     parameter "[SERVICE] ...", "Services to start"
 
@@ -38,7 +39,14 @@ module Kontena::Cli::Apps
 
     def deploy_services(queue)
       queue.each do |service|
-        deploy_service(token, service['id'].split('/').last, {})
+        name = service['id'].split('/').last
+        deploy_service(token, name, {})
+        print "deploying #{name.sub("#{service_prefix}-", '').colorize(:cyan)}"
+        unless async?
+          wait_for_deploy_to_finish(token, service['id'])
+        else
+          puts ''
+        end
       end
     end
 
@@ -150,6 +158,7 @@ module Kontena::Cli::Apps
       end
 
       data[:hooks] = options['hooks'] || {}
+      data[:secrets] = options['secrets'] if options['secrets']
 
       data
     end

data/lib/kontena/cli/apps/docker_helper.rb

@@ -1,14 +1,19 @@
 module Kontena::Cli::Apps
   module DockerHelper
 
-    def process_docker_images(services, force_build = false)
+    def process_docker_images(services, force_build = false, no_cache=false)
+      if services.none?{|name, service| service['build']}
+        puts "Not found any service with build option"
+        return
+      end
+
       services.each do |name, service|
         if service['build'] && (!image_exist?(service['image']) || force_build)
+          dockerfile = service['dockerfile'] || 'Dockerfile'
           abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
-          abort("'#{service['build']}' does not have Dockerfile") unless dockerfile_exist?(service['build'])
+          abort("'#{service['build']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build'], dockerfile)
           puts "Building image #{service['image'].colorize(:cyan)}"
-          build_docker_image(service['image'], service['build'])
-
+          build_docker_image(service['image'], service['build'], dockerfile, no_cache)
           puts "Pushing image #{service['image'].colorize(:cyan)} to registry"
           push_docker_image(service['image'])
         end
@@ -20,8 +25,12 @@ module Kontena::Cli::Apps
     end
 
 
-    def build_docker_image(name, path)
-      ret = system("docker build -t #{name} #{path}")
+    def build_docker_image(name, path, dockerfile, no_cache=false)
+      if no_cache
+        ret = system("docker build -t #{name} -f #{dockerfile} --no-cache #{path}")
+      else
+        ret = system("docker build -t #{name} -f #{dockerfile} #{path}")
+      end
       abort("Failed to build image #{name.colorize(:cyan)}") unless ret
       ret
     end
@@ -36,8 +45,8 @@ module Kontena::Cli::Apps
       `docker history #{image} 2>&1` ; $?.success?
     end
 
-    def dockerfile_exist?(path)
-      file = File.join(File.expand_path(path), 'Dockerfile')
+    def dockerfile_exist?(path, dockerfile)
+      file = File.join(File.expand_path(path), dockerfile)
       File.exist?(file)
     end
   end

data/lib/kontena/cli/apps/logs_command.rb

@@ -36,7 +36,7 @@ module Kontena::Cli::Apps
         services.each do |service_name, opts|
           service = get_service(token, prefixed_name(service_name)) rescue false
           result = client(token).get("services/#{service['id']}/container_logs?#{query_params.join('&')}") if service
-          logs = logs + result['logs']
+          logs = logs + result['logs'] if result && result['logs']
         end
         logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
         logs.each do |log|

data/lib/kontena/cli/common.rb

@@ -9,7 +9,7 @@ module Kontena
       end
 
       def require_token
-        token = ENV['KONTENA_TOKEN'] || settings['server']['token']
+        token = ENV['KONTENA_TOKEN'] || current_master['token']
         unless token
           raise ArgumentError.new("Please login first using: kontena login")
         end
@@ -25,7 +25,6 @@ module Kontena
 
           @client = Kontena::Client.new(api_url, headers)
         end
-
         @client
       end
 
@@ -41,15 +40,27 @@ module Kontena
         if @settings.nil?
           if File.exists?(settings_filename)
             @settings = JSON.parse(File.read(settings_filename))
+            unless @settings['current_server']
+              # Let's migrate the old settings model to new
+              @settings['server']['name'] = 'default'
+              @settings = {
+                  'current_server' => 'default',
+                  'servers' => [ @settings['server']]
+              }
+              save_settings
+            end
           else
-            @settings = {'server' => {}}
+            @settings = {
+                'current_server' => 'default',
+                'servers' => [{}]
+            }
           end
         end
         @settings
       end
 
       def api_url
-        url = ENV['KONTENA_URL'] || settings['server']['url']
+        url = ENV['KONTENA_URL'] || current_master['url']
         unless url
           raise ArgumentError.new("It seem's that you are not logged into Kontena master, please login with: kontena login")
         end
@@ -68,7 +79,7 @@ module Kontena
       end
 
       def current_grid=(grid)
-        settings['server']['grid'] = grid['id']
+        settings['servers'][current_master_index]['grid'] = grid['id']
         save_settings
       end
 
@@ -79,12 +90,52 @@ module Kontena
       end
 
       def clear_current_grid
-        settings['server'].delete('grid')
+        settings['servers'][current_master_index].delete('grid')
         save_settings
       end
 
       def current_grid
-        ENV['KONTENA_GRID'] || settings['server']['grid']
+        ENV['KONTENA_GRID'] || current_master['grid']
+      end
+
+      def current_master_index
+        current_server = settings['current_server'] || 'default'
+        settings['servers'].find_index{|m| m['name'] == current_server}
+      end
+
+      def current_master
+        index = current_master_index
+        unless index
+          raise ArgumentError.new("It seem's that you are not logged into ANY Kontena master, please login with: kontena login")
+        end
+        settings['servers'][index]
+      end
+
+      def current_master=(master_alias)
+        settings['current_server'] = master_alias
+        save_settings
+      end
+
+      def api_url=(api_url)
+        settings['servers'][current_master_index]['url'] = api_url
+        save_settings
+      end
+
+      def access_token=(token)
+        settings['servers'][current_master_index]['token'] = token
+        save_settings
+      end
+
+      def add_master(server_name, master_info)
+        server_name = server_name || 'default'
+        index = settings['servers'].find_index{|m| m['name'] == server_name}
+        if index
+          settings['servers'][index] = master_info
+        else
+          settings['servers'] << master_info
+        end
+        settings['current_server'] = server_name
+        save_settings
       end
 
       def save_settings

data/lib/kontena/cli/external_registries/add_command.rb

@@ -2,19 +2,17 @@ module Kontena::Cli::ExternalRegistries
   class AddCommand < Clamp::Command
     include Kontena::Cli::Common
 
-    def execute
-      require 'highline/import'
+    parameter '[URL]', 'Docker Registry url', default: 'https://index.docker.io/v2/'
+
+    option ['-u', '--username'], 'USERNAME', 'Username', required: true
+    option ['-e', '--email'], 'EMAIL', 'Email', required: true
+    option ['-p', '--password'], 'PASSWORD', 'Password', required: true
 
-      default_url = 'https://index.docker.io/v2/'
+    def execute
       require_api_url
       require_current_grid
       token = require_token
 
-      username = ask("Username: ")
-      password = ask("Password: ") { |q| q.echo = "*" }
-      email = ask("Email: ")
-      url = ask("URL [#{default_url}]: ")
-      url = default_url if url.strip == ''
       data = { username: username, password: password, email: email, url: url }
       client(token).post("grids/#{current_grid}/external_registries", data)
     end

data/lib/kontena/cli/grid_command.rb

@@ -18,7 +18,7 @@ class Kontena::Cli::GridCommand < Clamp::Command
   subcommand "use", "Switch to use specific grid", Kontena::Cli::Grids::UseCommand
   subcommand "show", "Show grid details", Kontena::Cli::Grids::ShowCommand
   subcommand "logs", "Show logs from grid containers", Kontena::Cli::Grids::LogsCommand
-  subcommand "remove", "Remove a grid", Kontena::Cli::Grids::RemoveCommand
+  subcommand ["remove","rm"], "Remove a grid", Kontena::Cli::Grids::RemoveCommand
   subcommand "current", "Show current grid details", Kontena::Cli::Grids::CurrentCommand
   subcommand "env", "Show the current grid environment details", Kontena::Cli::Grids::EnvCommand
   subcommand "audit-log", "Show audit log of the current grid", Kontena::Cli::Grids::AuditLogCommand

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

@@ -5,7 +5,7 @@ module Kontena::Cli::Grids
     # @param [Hash] grid
     def print_grid(grid)
       puts "#{grid['name']}:"
-      puts "  uri: #{settings['server']['url'].sub('http', 'ws')}"
+      puts "  uri: #{self.current_master['url'].sub('http', 'ws')}"
       puts "  token: #{grid['token']}"
       puts "  users: #{grid['user_count']}"
       puts "  nodes: #{grid['node_count']}"

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

@@ -5,13 +5,20 @@ module Kontena::Cli::Grids
     include Kontena::Cli::Common
     include Common
 
+    option ["--name"], :flag, "Show name only", default: false
+
     def execute
       require_api_url
       if current_grid.nil?
         abort 'No grid selected. To select grid, please run: kontena grid use <grid name>'
       else
+
         grid = client(require_token).get("grids/#{current_grid}")
-        print_grid(grid)
+        if name?
+          puts "#{grid['name']}"
+        else
+          print_grid(grid)
+        end
       end
     end
   end

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

@@ -5,14 +5,20 @@ module Kontena::Cli::Grids
     include Kontena::Cli::Common
     include Common
 
+    parameter "[NAME]", "Grid name"
     option ["-e", "--export"], :flag, "Add export", default: false
 
     def execute
       require_api_url
-      if current_grid.nil?
-        abort 'No grid selected. To select grid, please run: kontena grid use <grid name>'
+
+      name_or_current = name.nil? ? current_grid : name
+
+      if name_or_current.nil?
+        abort "No grid selected. Use: kontena grid env <name>, or select a grid with: kontena grid use <name>"
       else
-        grid = client(require_token).get("grids/#{current_grid}")
+        grid = find_grid_by_name(name_or_current)
+        abort("Grid not found".colorize(:red)) unless grid
+
         prefix = export? ? 'export ' : ''
         puts "#{prefix}KONTENA_URI=#{settings['server']['url'].sub('http', 'ws')}"
         puts "#{prefix}KONTENA_TOKEN=#{grid['token']}"

data/lib/kontena/cli/login_command.rb

@@ -3,13 +3,16 @@ class Kontena::Cli::LoginCommand < Clamp::Command
 
   parameter "URL", "Kontena Master URI"
 
+  option ['-n', '--name'], 'NAME', 'Local alias name for the master. Default default'
+
   def execute
     require 'highline/import'
 
     until !url.nil? && !url.empty?
       api_url = ask('Kontena Master Node URL: ')
     end
-    update_api_url(url)
+
+    @api_url = url
 
     unless request_server_info
       puts 'Could not connect to server'.colorize(:red)
@@ -21,7 +24,7 @@ class Kontena::Cli::LoginCommand < Clamp::Command
     response = do_login(email, password)
 
     if response
-      update_access_token(response['access_token'])
+      update_master_info(name, url, response['access_token'])
       display_logo
       puts ''
       puts "Logged in as #{response['user']['name'].green}"
@@ -52,6 +55,14 @@ class Kontena::Cli::LoginCommand < Clamp::Command
     end
   end
 
+
+  def login_client
+    if @login_client.nil?
+      @login_client = Kontena::Client.new(@api_url)
+    end
+    @login_client
+  end
+
   def do_login(email, password)
     params = {
         username: email,
@@ -59,13 +70,13 @@ class Kontena::Cli::LoginCommand < Clamp::Command
         grant_type: 'password',
         scope: 'user'
     }
-    client.post('auth', params)
+    login_client.post('auth', params)
   end
 
   def request_server_info
     valid = true
     begin
-      client.get('ping') # test server connection
+      login_client.get('ping') # test server connection
     rescue Excon::Errors::SocketError => exc
       if exc.message.include?('Unable to verify certificate')
         puts "The server uses a certificate signed by an unknown authority.".colorize(:red)
@@ -81,21 +92,20 @@ class Kontena::Cli::LoginCommand < Clamp::Command
   end
 
   ##
-  # Store api_url to config file
   #
-  # @param [String] api_url
-  def update_api_url(api_url)
-    settings['server']['url'] = api_url
-    save_settings
-  end
-
-  ##
-  # Store access token to config file
+  # @param [String] name
+  # @param [String] url
+  # @param [String] token
   #
-  # @param [String] access_token
-  def update_access_token(access_token)
-    settings['server']['token'] = access_token
-    save_settings
+  def update_master_info(name, url, token)
+    name = name || 'default'
+    master = {
+        'name' => name,
+        'url' => url,
+        'token' => token
+    }
+
+    self.add_master(name, master)
   end
 
   def display_logo