kontena-cli 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c2841422fbf5d03c51d4d49abdd57bb99abb737
-  data.tar.gz: 619c1ef499ebd0e59ba480771631b08d7656c063
+  metadata.gz: f6f13af1e4ef1baba9a25c485fcdf2eed975896e
+  data.tar.gz: 379ce85400a3c12551fba0d4308b1a58c0b9e6cb
 SHA512:
-  metadata.gz: 12861ef60ea0076e51ec577927d3ef157d8d112ecf2649bc7bbd2cfac803ce2c2846bef9f194c9dabbc59b4a523d2370751811dfbaedb86fd67bc6e7d3110123
-  data.tar.gz: d2e105c2d20fbb5acac25907d2851e30d909a280282b3554906c24faad2fd4f9b1ec3311df9a89eb1f1350aebea3595846ed79975ba74009c247b28d79052330
+  metadata.gz: 17b1db66fd0e64336ed40bac883691760ccfd96a336ba904626cc5973dcff8154aa231899d44335376a4e427620024e32b4a56b9f76ec1818d67ce992bf1818c
+  data.tar.gz: b272375202893d439b306367bef26372aa26433fa1e947daa3cf0f6470a05671f03fd1735dbc5397fb38daa7c7a960c7cffae7ccb34ed2a09477bf62aea6f763

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/bin/kontena

@@ -37,7 +37,6 @@ require 'kontena/cli/version_command'
 
 class MainCommand < Clamp::Command
 
-  subcommand "app", "Grid specific commands", Kontena::Cli::AppCommand
   subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
   subcommand "app", "App specific commands", Kontena::Cli::AppCommand
   subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand

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

@@ -17,10 +17,8 @@ module Kontena::Cli::Apps
     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?
+      process_docker_images(services, true)
     end
   end
-end
+end

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

@@ -34,14 +34,15 @@ module Kontena::Cli::Apps
 
     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')
-          extension_file = options['extends']['file']
-          service_name =  options['extends']['service']
-          options.delete('extends')
-          services[name] = extend_options(options, extension_file , service_name, prefix)
+      Dir.chdir(File.dirname(File.expand_path(file))) do
+        services.each do |name, options|
+          normalize_env_vars(options)
+          if options.has_key?('extends')
+            extension_file = options['extends']['file']
+            service_name =  options['extends']['service']
+            options.delete('extends')
+            services[name] = extend_options(options, extension_file , service_name, prefix)
+          end
         end
       end
       if name.nil?
@@ -73,14 +74,6 @@ module Kontena::Cli::Apps
       env_vars
     end
 
-    def dockerfile_exist?
-      !dockerfile.nil?
-    end
-
-    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
@@ -90,6 +83,8 @@ module Kontena::Cli::Apps
     def app_json
       if !@app_json && File.exist?('app.json')
         @app_json = JSON.parse(File.read('app.json'))
+      else
+        @app_json = {}
       end
       @app_json
     end

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

@@ -20,12 +20,10 @@ module Kontena::Cli::Apps
       require_api_url
       require_token
       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?
+      process_docker_images(services) if !no_build?
       create_or_update_services(services)
       deploy_services(deploy_queue)
     end

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

@@ -17,7 +17,10 @@ module Kontena::Cli::Apps
         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
+          if app_json && service == 'web' # Heroku generates PORT env variable so should we do too
+            docker_compose[service]['environment'] = ['PORT=5000']
+            docker_compose[service]['ports'] = ['5000:5000']
+          end
           docker_compose[service]['command'] = "/start #{service}" if service != 'web'
           docker_compose[service]['env_file'] = env_file if env_file
 

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

@@ -5,6 +5,7 @@ module Kontena::Cli::Apps
       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'])
+          abort("'#{service['build']}' does not have Dockerfile") unless dockerfile_exist?(service['build'])
           puts "Building image #{service['image'].colorize(:cyan)}"
           build_docker_image(service['image'], service['build'])
 
@@ -20,15 +21,24 @@ module Kontena::Cli::Apps
 
 
     def build_docker_image(name, path)
-      system("docker build -t #{name} #{path}")
+      ret = system("docker build -t #{name} #{path}")
+      abort("Failed to build image #{name.colorize(:cyan)}") unless ret
+      ret
     end
 
     def push_docker_image(image)
-      system("docker push #{image}")
+      ret = system("docker push #{image}")
+      abort("Failed to push image #{image.colorize(:cyan)}") unless ret
+      ret
     end
 
     def image_exist?(image)
       `docker history #{image} 2>&1` ; $?.success?
     end
+
+    def dockerfile_exist?(path)
+      file = File.join(File.expand_path(path), 'Dockerfile')
+      File.exist?(file)
+    end
   end
-end
+end

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

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

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

@@ -27,7 +27,7 @@ module Kontena::Cli::Apps
         puts 'Found Dockerfile'
       elsif create_dockerfile?
         puts "Creating #{'Dockerfile'.colorize(:cyan)}"
-        DockerfileGenerator.new.generate(base_image, current_user['email'])
+        DockerfileGenerator.new.generate(base_image)
       end
 
       if File.exist?('Procfile')
@@ -88,11 +88,6 @@ module Kontena::Cli::Apps
       nil
     end
 
-    def current_user
-      token = require_token
-      client(token).get('user') rescue ''
-    end
-
     def create_docker_compose_yml?
       ['', 'y', 'yes'].include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
     end

data/lib/kontena/cli/master/vagrant/start_command.rb

@@ -5,9 +5,9 @@ module Kontena::Cli::Master::Vagrant
     def execute
       require 'kontena/machine/vagrant'
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
-      abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
+      abort("Cannot find Vagrant node kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Starting Vagrant machine #{name.colorize(:cyan)} " do
+        ShellSpinner "Starting Vagrant machine kontena-master " do
           Open3.popen2('vagrant up') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/cli/vpn/config_command.rb

@@ -3,10 +3,22 @@ module Kontena::Cli::Vpn
     include Kontena::Cli::Common
 
     def execute
+      require 'rbconfig'
       require_api_url
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
       stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
+      if linux?
+        stdout << "\n"
+        stdout << "up /etc/openvpn/update-resolv-conf\n"
+        stdout << "down /etc/openvpn/update-resolv-conf\n"
+      end
       puts stdout
     end
+
+    # @return [Boolean]
+    def linux?
+      host_os = RbConfig::CONFIG['host_os']
+      host_os.include?('linux')
+    end
   end
 end

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

@@ -22,8 +22,7 @@ module Kontena::Cli::Vpn
         abort('Node not found') if node.nil?
       end
 
-      public_ip = ip || node['public_ip']
-
+      vpn_ip = node_vpn_ip(node)
       data = {
         name: 'vpn',
         stateful: true,
@@ -36,7 +35,7 @@ module Kontena::Cli::Vpn
           }
         ],
         cap_add: ['NET_ADMIN'],
-        env: ["OVPN_SERVER_URL=udp://#{public_ip}:1194"],
+        env: ["OVPN_SERVER_URL=udp://#{vpn_ip}:1194"],
         affinity: ["node==#{node['name']}"]
       }
       client(token).post("grids/#{current_grid}/services", data)
@@ -47,8 +46,21 @@ module Kontena::Cli::Vpn
         sleep 1
       end
       puts ' done'
-      puts "OpenVPN service is now started (udp://#{public_ip}:1194)."
+      puts "OpenVPN service is now started (udp://#{vpn_ip}:1194)."
       puts "Use 'kontena vpn config' to fetch OpenVPN client config to your machine (it takes a while until config is ready)."
     end
+
+    # @param [Hash] node
+    # @return [String]
+    def node_vpn_ip(node)
+      ip unless ip.nil?
+
+      # vagrant
+      if api_url == 'http://192.168.66.100:8080'
+        node['private_ip']
+      else
+        node['public_ip']
+      end
+    end
   end
 end

data/lib/kontena/machine/aws/cloudinit.yml

@@ -12,7 +12,7 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
 coreos:
   units:
     - name: 00-eth.network
@@ -22,7 +22,7 @@ coreos:
         Name=eth*
         [Network]
         DHCP=yes
-        DNS=172.17.42.1
+        DNS=172.17.43.1
         DNS=<%= dns_server %>
         DOMAINS=kontena.local
         [DHCP]

data/lib/kontena/machine/azure/cloudinit.yml

@@ -11,12 +11,12 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
   - path: /etc/resolv.conf
     permissions: 0644
     owner: root
     content: |
-      nameserver 172.17.42.1
+      nameserver 172.17.43.1
       nameserver 8.8.8.8
       nameserver 8.8.4.4
 coreos:

data/lib/kontena/machine/digital_ocean/cloudinit.yml

@@ -11,12 +11,12 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
   - path: /etc/resolv.conf
     permissions: 0644
     owner: root
     content: |
-      nameserver 172.17.42.1
+      nameserver 172.17.43.1
       nameserver 8.8.8.8
       nameserver 8.8.4.4
 coreos:

data/lib/kontena/machine/vagrant/cloudinit.yml

@@ -11,7 +11,7 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
 coreos:
   units:
     - name: 00-eth.network
@@ -21,7 +21,7 @@ coreos:
         Name=eth*
         [Network]
         DHCP=yes
-        DNS=172.17.42.1
+        DNS=172.17.43.1
         DNS=172.28.128.1
         DNS=8.8.8.8
         DOMAINS=kontena.local

data/spec/kontena/cli/app/deploy_command_spec.rb

@@ -126,7 +126,6 @@ yml
 
       it 'uses current directory as service name prefix by default' do
         current_dir = '/kontena/tests/stacks'
-        allow(Dir).to receive(:chdir).and_return(true)
         allow(Dir).to receive(:getwd).and_return(current_dir)
         expect(File).to receive(:basename).with(current_dir).and_return('stacks')
         subject.run([])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler