kontena-cli 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5495634079f9438b5489ef1b059675ecd1b1816e
-  data.tar.gz: 2f2d23237da702fe1dd1919a83621d004d129d9a
+  metadata.gz: 2c2841422fbf5d03c51d4d49abdd57bb99abb737
+  data.tar.gz: 619c1ef499ebd0e59ba480771631b08d7656c063
 SHA512:
-  metadata.gz: e44eaeae82ce15d7e09cb238cca449c8d7cfcf9ce666018dc8daa89aceb5a8ddc00a5077d5dbfe81aaae71a7ccb61f4e410054bc2f59dcbe13ed94ff6eacae08
-  data.tar.gz: 1a0ac1c623f49eb325c31d41cc108d0fabcce469848cca141b3b280827b6919f3f26a2456f4addac0ad378d74db41ed2ec47a86d67d62f5ad58018af620b95bd
+  metadata.gz: 12861ef60ea0076e51ec577927d3ef157d8d112ecf2649bc7bbd2cfac803ce2c2846bef9f194c9dabbc59b4a523d2370751811dfbaedb86fd67bc6e7d3110123
+  data.tar.gz: d2e105c2d20fbb5acac25907d2851e30d909a280282b3554906c24faad2fd4f9b1ec3311df9a89eb1f1350aebea3595846ed79975ba74009c247b28d79052330

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

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

@@ -80,5 +80,51 @@ module Kontena::Cli::Apps
     def dockerfile
       @dockerfile ||= File.new('Dockerfile') rescue nil
     end
+
+    def create_yml(services, file='kontena.yml')
+      yml = File.new(file, 'w')
+      yml.puts services.to_yaml
+      yml.close
+    end
+
+    def app_json
+      if !@app_json && File.exist?('app.json')
+        @app_json = JSON.parse(File.read('app.json'))
+      end
+      @app_json
+    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=redis://#{prefix}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',
+              'environment' => ["MEMCACHEDCLOUD_SERVERS=#{prefix}memcachedcloud:11211"]
+          }
+      }
+    end
   end
 end

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

@@ -0,0 +1,46 @@
+require 'yaml'
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class DockerComposeGenerator
+    include Common
+
+    attr_reader :docker_compose_file
+
+    def initialize(filename)
+      @docker_compose_file = filename
+    end
+
+    def generate(procfile, addons, env_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
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'yaml'
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class DockerfileGenerator
+    include Common
+
+    def generate(base_image, maintainer)
+
+      dockerfile = File.new('Dockerfile', 'w')
+      dockerfile.puts "FROM #{base_image}"
+      dockerfile.puts "MAINTAINER #{maintainer}"
+      dockerfile.puts 'CMD ["/start", "web"]'
+      dockerfile.close
+    end
+  end
+end

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

@@ -1,9 +1,15 @@
 require 'yaml'
 require 'securerandom'
+require_relative 'common'
+require_relative 'dockerfile_generator'
+require_relative 'docker_compose_generator'
+require_relative 'kontena_yml_generator'
+
 
 module Kontena::Cli::Apps
   class InitCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     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"
@@ -19,38 +25,40 @@ module Kontena::Cli::Apps
 
       if File.exist?('Dockerfile')
         puts 'Found Dockerfile'
-      else
-        create_dockerfile if create_dockerfile?
+      elsif create_dockerfile?
+        puts "Creating #{'Dockerfile'.colorize(:cyan)}"
+        DockerfileGenerator.new.generate(base_image, current_user['email'])
       end
 
-      if File.exist?(docker_compose_file)
-        puts "Found #{docker_compose_file}."
+      if File.exist?('Procfile')
+        procfile = YAML.load(File.read('Procfile'))
       else
-        if File.exist?('Procfile')
-          procfile = YAML.load(File.read('Procfile'))
-        else
-          procfile = {}
-        end
-
-        app_env = nil
-        addons = []
+        procfile = {}
+      end
 
-        if app_json
-          app_env = create_env_file(app_json)
-          addons = app_json['addons'] || []
-        end
+      app_env = create_env_file(app_json)
+      addons = app_json['addons'] || []
 
-        create_docker_compose_yml(procfile, addons, app_env) if create_docker_compose_yml?
+      if File.exist?(docker_compose_file)
+        puts "Found #{docker_compose_file}."
+      elsif create_docker_compose_yml?
+        puts "Creating #{docker_compose_file.colorize(:cyan)}"
+        docker_compose_generator = DockerComposeGenerator.new(docker_compose_file)
+        docker_compose_generator.generate(procfile, addons, app_env)
       end
 
-      services = generate_kontena_services(docker_compose_file)
       if File.exist?('kontena.yml')
-        merge_kontena_yml!(services)
-        puts "#{'kontena.yml'.colorize(:cyan)} updated."
+        puts "Updating #{'kontena.yml'.colorize(:cyan)}"
       else
         puts "Creating #{'kontena.yml'.colorize(:cyan)}"
       end
-      create_yml(services, 'kontena.yml')
+
+      kontena_yml_generator = KontenaYmlGenerator.new(image_name, service_prefix)
+      if File.exist?(docker_compose_file)
+        kontena_yml_generator.generate_from_compose_file(docker_compose_file)
+      else
+        kontena_yml_generator.generate(procfile, addons, app_env)
+      end
 
       puts "Your app is ready! Deploy with 'kontena app deploy'.".colorize(:green)
     end
@@ -58,13 +66,6 @@ module Kontena::Cli::Apps
 
     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?
       ['', 'y', 'yes'].include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
     end
@@ -92,130 +93,9 @@ module Kontena::Cli::Apps
       client(token).get('user') rescue ''
     end
 
-    def create_dockerfile
-      puts "Creating #{'Dockerfile'.colorize(:cyan)}"
-      dockerfile = File.new('Dockerfile', 'w')
-      dockerfile.puts "FROM #{base_image}"
-      dockerfile.puts "MAINTAINER #{current_user['email']}"
-      dockerfile.puts 'CMD ["/start", "web"]'
-      dockerfile.close
-    end
-
-    def merge_kontena_yml!(services)
-      puts "kontena.yml already exists. Merging changes."
-      kontena_services = YAML.load(File.read('kontena.yml'))
-      services.each do |name, options|
-        if kontena_services[name]
-          services[name].merge!(kontena_services[name])
-        end
-      end
-    end
-
     def create_docker_compose_yml?
       ['', 'y', 'yes'].include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
     end
 
-    def create_docker_compose_yml(procfile, addons, env_file)
-      puts "Creating #{docker_compose_file.colorize(:cyan)}"
-      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)}:latest"
-            services[name]['image'] = image
-          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
-        # 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
-
-    def create_yml(services, file='kontena.yml')
-      yml = File.new(file, 'w')
-      yml.puts services.to_yaml
-      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

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

@@ -0,0 +1,95 @@
+require 'yaml'
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class KontenaYmlGenerator
+    include Common
+
+    attr_reader :image_name, :service_prefix
+
+    def initialize(image_name, service_prefix)
+      @image_name = image_name
+      @service_prefix = service_prefix
+    end
+
+    def generate_from_compose_file(docker_compose_file)
+      services = {}
+      # extend services from docker-compose.yml
+      file = File.read(docker_compose_file)
+      compose_services = YAML.load(file)
+      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)}:latest"
+          services[name]['image'] = image
+        end
+
+        # set Heroku addon service as stateful by default
+        if valid_addons.has_key?(name)
+          services[name]['stateful'] = true
+        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
+      create_yml(services, 'kontena.yml')
+
+    end
+
+    def generate(procfile, addons, env_file)
+      image = image_name || "registry.kontena.local/#{File.basename(Dir.getwd)}:latest"
+      if procfile.keys.size > 0
+        # generate services found in Procfile
+        services = {}
+        procfile.keys.each do |name|
+          services[name] = {'image' => image}
+          services[name]['environment'] = ['PORT=5000'] if app_json && name == 'web' # Heroku generates PORT env variable so should we do too
+          services[name]['command'] = "/start #{name}" if name != 'web'
+          services[name]['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)
+              services[name]['links'] ||= []
+              services[name]['links'] << "#{addon_service}:#{addon_service}"
+              services[name]['environment'] ||= []
+              services[name]['environment'] += valid_addons(service_prefix)[addon_service]['environment']
+              services[addon_service] = {'image' => valid_addons[addon_service]['image'], 'stateful' => true}
+            end
+          end
+        end
+      else
+        # no Procfile found, create dummy web service
+        services = {'web' => { 'image' => image}}
+        services['web']['env_file'] = env_file if env_file
+      end
+      # create kontena.yml file
+      create_yml(services, 'kontena.yml')
+    end
+
+    def create_yml(services, filename)
+      if File.exist?(filename)
+        kontena_services = YAML.load(File.read(filename))
+        services.each do |name, options|
+          if kontena_services[name]
+            services[name].merge!(kontena_services[name])
+          end
+        end
+      end
+      super(services, filename)
+    end
+
+
+  end
+end

data/lib/kontena/cli/master/aws/create_command.rb

@@ -4,11 +4,12 @@ module Kontena::Cli::Master::Aws
 
     option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
     option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
+    option "--key-pair", "KEY_PAIR", "EC2 Key Pair", required: true
+    option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
     option "--zone", "ZONE", "EC2 Availability Zone", default: 'a'
     option "--vpc-id", "VPC ID", "Virtual Private Cloud (VPC) ID"
     option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into"
-    option "--key-pair", "KEY_PAIR", "EC2 Key Pair", required: true
     option "--type", "SIZE", "Instance type", default: 't2.small'
     option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
@@ -23,6 +24,7 @@ module Kontena::Cli::Master::Aws
           vpc: vpc_id,
           zone: zone,
           subnet: subnet_id,
+          ssl_cert: ssl_cert,
           storage: storage,
           version: version,
           key_pair: key_pair,
@@ -30,4 +32,4 @@ module Kontena::Cli::Master::Aws
       )
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,8 +130,11 @@ files:
 - lib/kontena/cli/apps/build_command.rb
 - lib/kontena/cli/apps/common.rb
 - lib/kontena/cli/apps/deploy_command.rb
+- lib/kontena/cli/apps/docker_compose_generator.rb
 - lib/kontena/cli/apps/docker_helper.rb
+- lib/kontena/cli/apps/dockerfile_generator.rb
 - lib/kontena/cli/apps/init_command.rb
+- lib/kontena/cli/apps/kontena_yml_generator.rb
 - lib/kontena/cli/apps/list_command.rb
 - lib/kontena/cli/apps/logs_command.rb
 - lib/kontena/cli/apps/remove_command.rb