kontena-cli 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0628f196135c9957f21c05c15285a0f371189591
-  data.tar.gz: 11a863701cb5882231050becdc6580785d32d8cb
+  metadata.gz: 5495634079f9438b5489ef1b059675ecd1b1816e
+  data.tar.gz: 2f2d23237da702fe1dd1919a83621d004d129d9a
 SHA512:
-  metadata.gz: 889e623ca9d6d28f7539b32f71ef88b7e885e7a9f23210fbdddda03a7b0f039c0d4eb736295d8c56724389a1b5fdce410ba8a49e0d4276bac4242ed7083d8ad0
-  data.tar.gz: fe438888d3eee5e24d4ef5b06e94cd7a81030de268509fa9e98619a510dbf71d45dd2bfb671d4e1a708e1f9cc136c754876ec71675f7d7f81fe4fb2bd9d7c908
+  metadata.gz: e44eaeae82ce15d7e09cb238cca449c8d7cfcf9ce666018dc8daa89aceb5a8ddc00a5077d5dbfe81aaae71a7ccb61f4e410054bc2f59dcbe13ed94ff6eacae08
+  data.tar.gz: 1a0ac1c623f49eb325c31d41cc108d0fabcce469848cca141b3b280827b6919f3f26a2456f4addac0ad378d74db41ed2ec47a86d67d62f5ad58018af620b95bd

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.9.0

data/bin/kontena

@@ -24,6 +24,7 @@ require 'kontena/cli/forgot_password_command'
 require 'kontena/cli/reset_password_command'
 require 'kontena/cli/container_command'
 require 'kontena/cli/grid_command'
+require 'kontena/cli/master_command'
 require 'kontena/cli/node_command'
 require 'kontena/cli/service_command'
 require 'kontena/cli/vpn_command'
@@ -31,6 +32,7 @@ require 'kontena/cli/registry_command'
 require 'kontena/cli/external_registry_command'
 require 'kontena/cli/deploy_command'
 require 'kontena/cli/app_command'
+require 'kontena/cli/etcd_command'
 require 'kontena/cli/version_command'
 
 class MainCommand < Clamp::Command
@@ -41,9 +43,11 @@ class MainCommand < Clamp::Command
   subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
   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
   subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
   subcommand "registry", "Registry specific commands", Kontena::Cli::RegistryCommand
   subcommand "container", "Container specific commands", Kontena::Cli::ContainerCommand
+  subcommand "etcd", "Etcd specific commands", Kontena::Cli::EtcdCommand
   subcommand "external-registry", "External registry specific commands", Kontena::Cli::ExternalRegistryCommand
   subcommand "register", "Register Kontena Account", Kontena::Cli::RegisterCommand
   subcommand "login", "Login to Kontena Master", Kontena::Cli::LoginCommand

data/lib/kontena/cli/app_command.rb

@@ -1,4 +1,5 @@
 require_relative 'apps/init_command'
+require_relative 'apps/build_command'
 require_relative 'apps/deploy_command'
 require_relative 'apps/start_command'
 require_relative 'apps/stop_command'
@@ -9,6 +10,7 @@ require_relative 'apps/logs_command'
 class Kontena::Cli::AppCommand < Clamp::Command
 
   subcommand "init", "Init Kontena application", Kontena::Cli::Apps::InitCommand
+  subcommand "build", "Build Kontena services", Kontena::Cli::Apps::BuildCommand
   subcommand "deploy", "Deploy Kontena services", Kontena::Cli::Apps::DeployCommand
   subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand
   subcommand "stop", "Stop services", Kontena::Cli::Apps::StopCommand

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

@@ -0,0 +1,26 @@
+require 'yaml'
+require_relative 'common'
+require_relative 'docker_helper'
+
+module Kontena::Cli::Apps
+  class BuildCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+    include DockerHelper
+
+    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"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      require_config_file(filename)
+      @service_prefix = project_name || current_dir
+      dir = Dir.getwd
+      @services = load_services(filename, service_list, service_prefix)
+      Dir.chdir(dir)
+      process_docker_images(services, true) if dockerfile_exist?
+    end
+  end
+end

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

@@ -4,12 +4,12 @@ module Kontena::Cli::Apps
   module Common
     include Kontena::Cli::Services::ServicesHelper
 
-    def load_services_from_yml
-      @service_prefix = project_name || current_dir
-
+    def require_config_file(filename)
       abort("File #{filename} does not exist") unless File.exists?(filename)
-      services = parse_yml_file(filename, nil, service_prefix)
+    end
 
+    def load_services(filename, service_list, prefix)
+      services = parse_services(filename, nil, prefix)
       services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
       services
     end
@@ -32,18 +32,17 @@ module Kontena::Cli::Apps
       get_service(token, prefixed_name(name)) rescue false
     end
 
-    def parse_yml_file(file, name = nil, prefix='')
-      services = YAML.load(File.read(file) % {prefix: prefix})
+    def parse_services(file, name = nil, prefix='')
+      services = YAML.load(File.read(File.expand_path(file)) % {project: prefix})
+      Dir.chdir(File.dirname(File.expand_path(file)))
       services.each do |name, options|
+        normalize_env_vars(options)
         if options.has_key?('extends')
-          extends = options['extends']
+          extension_file = options['extends']['file']
+          service_name =  options['extends']['service']
           options.delete('extends')
-          services[name] = parse_yml_file(extends['file'], extends['service']).merge(options)
-        end
-        if options.has_key?('build') 
-          options.delete('build')
+          services[name] = extend_options(options, extension_file , service_name, prefix)
         end
-
       end
       if name.nil?
         services
@@ -51,5 +50,35 @@ module Kontena::Cli::Apps
         services[name]
       end
     end
+
+    def extend_options(options, file, service_name, prefix)
+      parent_options = parse_services(file, service_name, prefix)
+      options['environment'] = extend_env_vars(parent_options, options)
+      parent_options.merge(options)
+    end
+
+    def normalize_env_vars(options)
+      if options['environment'].is_a?(Hash)
+        options['environment'] = options['environment'].map{|k, v| "#{k}=#{v}"}
+      end
+    end
+
+    def extend_env_vars(from, to)
+      env_vars = to['environment'] || []
+      if from['environment']
+        from['environment'].each do |env|
+          env_vars << env unless to['environment'] && to['environment'].find {|key| key.split('=').first == env.split('=').first}
+        end
+      end
+      env_vars
+    end
+
+    def dockerfile_exist?
+      !dockerfile.nil?
+    end
+
+    def dockerfile
+      @dockerfile ||= File.new('Dockerfile') rescue nil
+    end
   end
 end

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

@@ -1,30 +1,38 @@
 require 'yaml'
 require_relative 'common'
+require_relative 'docker_helper'
 
 module Kontena::Cli::Apps
   class DeployCommand < Clamp::Command
     include Kontena::Cli::Common
     include Common
+    include DockerHelper
 
     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)'
 
     parameter "[SERVICE] ...", "Services to start"
 
-    attr_reader :services, :service_prefix
+    attr_reader :services, :service_prefix, :deploy_queue
 
     def execute
       require_api_url
       require_token
-      @services = load_services_from_yml
-      Dir.chdir(File.dirname(filename))
-      init_services(services)
+      require_config_file(filename)
+      dir = Dir.getwd
+      @deploy_queue = []
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
+      Dir.chdir(dir)
+      process_docker_images(services) if !no_build? && dockerfile_exist?
+      create_or_update_services(services)
       deploy_services(deploy_queue)
     end
 
     private
 
-    def init_services(services)
+    def create_or_update_services(services)
       services.each do |name, config|
         create_or_update_service(name, config)
       end
@@ -32,7 +40,7 @@ module Kontena::Cli::Apps
 
     def deploy_services(queue)
       queue.each do |service|
-        puts "deploying #{service['id']}"
+        puts "deploying #{service['id'].colorize(:cyan)}"
         data = {}
         if service['deploy']
           data[:strategy] = service['deploy']['strategy'] if service['deploy']['strategy']
@@ -43,8 +51,7 @@ module Kontena::Cli::Apps
     end
 
     def create_or_update_service(name, options)
-
-      # skip if service is already created or updated or it's not present
+      # skip if service is already processed or it's not present
       return nil if in_deploy_queue?(name) || !services.keys.include?(name)
 
       # create/update linked services recursively before continuing
@@ -57,6 +64,7 @@ module Kontena::Cli::Apps
         end
       end
 
+      merge_external_links(options)
       merge_env_vars(options)
 
       if service_exists?(name)
@@ -77,7 +85,7 @@ module Kontena::Cli::Apps
 
     def create(name, options)
       name = prefixed_name(name)
-      puts "creating #{name}"
+      puts "creating #{name.colorize(:cyan)}"
       data = {name: name}
       data.merge!(parse_data(options))
       create_service(token, current_grid, data)
@@ -86,7 +94,7 @@ module Kontena::Cli::Apps
     def update(id, options)
       id = prefixed_name(id)
       data = parse_data(options)
-      puts "updating #{id}"
+      puts "updating #{id.colorize(:cyan)}"
       update_service(token, id, data)
     end
 
@@ -107,6 +115,14 @@ module Kontena::Cli::Apps
       options['environment'].uniq! {|s| s.split('=').first}
     end
 
+    def merge_external_links(options)
+      if options['external_links']
+        options['links'] ||= []
+        options['links'] = options['links'] + options['external_links']
+        options.delete('external_links')
+      end
+    end
+
     def read_env_file(path)
       File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
     end
@@ -129,13 +145,15 @@ module Kontena::Cli::Apps
       data[:affinity] = options['affinity'] if options['affinity']
       data[:user] = options['user'] if options['user']
       data[:stateful] = options['stateful'] == true
+      data[:privileged] = options['privileged'] unless options['privileged'].nil?
       data[:cap_add] = options['cap_add'] if options['cap_add']
       data[:cap_drop] = options['cap_drop'] if options['cap_drop']
+      data[:net] = options['net'] if options['net']
+      data[:log_driver] = options['log_driver'] if options['log_driver']
+      data[:log_opts] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
+
       data
     end
 
-    def deploy_queue
-      @deploy_queue ||= []
-    end
   end
 end

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

@@ -0,0 +1,34 @@
+module Kontena::Cli::Apps
+  module DockerHelper
+
+    def process_docker_images(services, force_build = false)
+      services.each do |name, service|
+        if service['build'] && (!image_exist?(service['image']) || force_build)
+          abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
+          puts "Building image #{service['image'].colorize(:cyan)}"
+          build_docker_image(service['image'], service['build'])
+
+          puts "Pushing image #{service['image'].colorize(:cyan)} to registry"
+          push_docker_image(service['image'])
+        end
+      end
+    end
+
+    def validate_image_name(name)
+      !(/^[\w.\/\-]+:?+[\w+.]+$/ =~ name).nil?
+    end
+
+
+    def build_docker_image(name, path)
+      system("docker build -t #{name} #{path}")
+    end
+
+    def push_docker_image(image)
+      system("docker push #{image}")
+    end
+
+    def image_exist?(image)
+      `docker history #{image} 2>&1` ; $?.success?
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'securerandom'
 
 module Kontena::Cli::Apps
   class InitCommand < Clamp::Command
@@ -7,10 +8,15 @@ module Kontena::Cli::Apps
     option ["-f", "--file"], "FILE", "Specify a docker-compose file", attribute_name: :docker_compose_file, default: 'docker-compose.yml'
     option ["-i", "--image-name"], "IMAGE_NAME", "Specify a docker image name"
     option ["-b", "--base-image"], "BASE_IMAGE_NAME", "Specify a docker base image name", default: "kontena/buildstep"
+    option ["-p", "--project-name"], "NAME", "Specify an alternate project name (default: directory name)"
+
+    attr_reader :service_prefix
 
     def execute
       require 'highline/import'
 
+      @service_prefix = project_name || File.basename(Dir.getwd)
+
       if File.exist?('Dockerfile')
         puts 'Found Dockerfile'
       else
@@ -20,7 +26,21 @@ module Kontena::Cli::Apps
       if File.exist?(docker_compose_file)
         puts "Found #{docker_compose_file}."
       else
-        create_docker_compose_yml if create_docker_compose_yml?
+        if File.exist?('Procfile')
+          procfile = YAML.load(File.read('Procfile'))
+        else
+          procfile = {}
+        end
+
+        app_env = nil
+        addons = []
+
+        if app_json
+          app_env = create_env_file(app_json)
+          addons = app_json['addons'] || []
+        end
+
+        create_docker_compose_yml(procfile, addons, app_env) if create_docker_compose_yml?
       end
 
       services = generate_kontena_services(docker_compose_file)
@@ -32,18 +52,44 @@ module Kontena::Cli::Apps
       end
       create_yml(services, 'kontena.yml')
 
-      puts "You are ready to go!".colorize(:green)
+      puts "Your app is ready! Deploy with 'kontena app deploy'.".colorize(:green)
     end
 
 
     protected
+
+    def app_json
+      if !@app_json && File.exist?('app.json')
+        @app_json = JSON.parse(File.read('app.json'))
+      end
+      @app_json
+    end
+
     def create_dockerfile?
-      %w(y yes).include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
+      ['', 'y', 'yes'].include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
+    end
+
+    def create_env_file(app_json)
+
+      if app_json['env']
+        app_env = File.new('.env', 'w')
+        app_json['env'].each do |key, env|
+          if env['generator'] == 'secret'
+            value = SecureRandom.hex(64)
+          else
+            value = env['value']
+          end
+          app_env.puts "#{key}=#{value}"
+        end
+        app_env.close
+        return '.env'
+      end
+      nil
     end
 
     def current_user
       token = require_token
-      client(token).get('user')
+      client(token).get('user') rescue ''
     end
 
     def create_dockerfile
@@ -51,6 +97,7 @@ module Kontena::Cli::Apps
       dockerfile = File.new('Dockerfile', 'w')
       dockerfile.puts "FROM #{base_image}"
       dockerfile.puts "MAINTAINER #{current_user['email']}"
+      dockerfile.puts 'CMD ["/start", "web"]'
       dockerfile.close
     end
 
@@ -65,28 +112,69 @@ module Kontena::Cli::Apps
     end
 
     def create_docker_compose_yml?
-      %w(y yes).include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
+      ['', 'y', 'yes'].include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
     end
 
-    def create_docker_compose_yml
+    def create_docker_compose_yml(procfile, addons, env_file)
       puts "Creating #{docker_compose_file.colorize(:cyan)}"
-      create_yml({'app' => { 'build' => '.'}}, docker_compose_file)
+      if procfile.keys.size > 0
+        # generate services found in Procfile
+        docker_compose = {}
+        procfile.keys.each do |service|
+          docker_compose[service] = {'build' => '.' }
+          docker_compose[service]['environment'] = ['PORT=5000'] if app_json && service == 'web' # Heroku generates PORT env variable so should we do too
+          docker_compose[service]['command'] = "/start #{service}" if service != 'web'
+          docker_compose[service]['env_file'] = env_file if env_file
+
+          # generate addon services
+          addons.each do |addon|
+            addon_service = addon.split(":")[0]
+            addon_service.slice!('heroku-')
+            if valid_addons.has_key?(addon_service)
+              docker_compose[service]['links'] = [] unless docker_compose[service]['links']
+              docker_compose[service]['links'] << "#{addon_service}:#{addon_service}"
+              docker_compose[service]['environment'] = [] unless docker_compose[service]['environment']
+              docker_compose[service]['environment'] += valid_addons[addon_service]['environment']
+              docker_compose[addon_service] = {'image' => valid_addons[addon_service]['image']}
+            end
+          end
+        end
+      else
+        # no Procfile found, create dummy web service
+        docker_compose = {'web' => { 'build' => '.'}}
+        docker_compose['web']['env_file'] = env_file if env_file
+      end
+      # create docker-compose.yml file
+      create_yml(docker_compose, docker_compose_file)
     end
 
     def generate_kontena_services(docker_compose = nil)
       services = {}
       if docker_compose && File.exist?(docker_compose)
+        # extend services from docker-compose.yml
         compose_services = YAML.load(File.read(docker_compose))
         compose_services.each do |name, options|
           services[name] = {'extends' => { 'file' => 'docker-compose.yml', 'service' => name }}
           if options.has_key?('build')
-            image = image_name || "registry.kontena.local/#{File.basename(Dir.getwd)}-#{name}:latest"
+            image = image_name || "registry.kontena.local/#{File.basename(Dir.getwd)}:latest"
             services[name]['image'] = image
-            options.delete('build')
+          end
+
+          # we have to generate Kontena urls to env vars for Heroku addons
+          # redis://openredis:6379 -> redis://project-name-openredis:6379
+          if options['links']
+            options['links'].each do |link|
+              service_link = link.split(':').first
+              if valid_addons.has_key?(service_link)
+                services[name]['environment'] ||= []
+                services[name]['environment'] += valid_addons(service_prefix)[service_link]['environment']
+              end
+            end
           end
         end
       else
-        services = {'app' => { 'image' => "registry.kontena.local/#{File.basename(Dir.getwd)}:latest" }}
+        # no docker-compose.yml found, just create dummy service with image name
+        services = {'web' => { 'image' => "registry.kontena.local/#{File.basename(Dir.getwd)}:latest" }}
       end
       services
     end
@@ -97,5 +185,37 @@ module Kontena::Cli::Apps
       yml.close
     end
 
+    def valid_addons(prefix=nil)
+      if prefix
+        prefix = "#{prefix}-"
+      end
+
+      {
+        'openredis' => {
+            'image' => 'redis:latest',
+            'environment' => ["REDIS_URL=redis://#{prefix}openredis:6379"]
+        },
+        'redis' => {
+          'image' => 'redis:latest',
+          'environment' => ["REDIS_URL=redis://#{prefix}redis:6379"]
+        },
+        'rediscloud' => {
+          'image' => 'redis:latest',
+          'environment' => ["REDISCLOUD_URL=#{prefix}redis://rediscloud:6379"]
+        },
+        'postgresql' => {
+          'image' => 'postgres:latest',
+          'environment' => ["DATABASE_URL=postgres://#{prefix}postgres:@postgresql:5432/postgres"]
+        },
+        'mongolab' => {
+          'image' => 'mongo:latest',
+          'environment' => ["MONGOLAB_URI=#{prefix}mongolab:27017"]
+        },
+        'memcachedcloud' => {
+          'image' => 'memcached:latest',
+          'enviroment' => ["MEMCACHEDCLOUD_SERVERS=#{prefix}memcachedcloud:11211"]
+        }
+      }
+    end
   end
 end