kontena-cli 0.8.0.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfab587091d57799af6a71901b2e06c2fdccfe2
-  data.tar.gz: a10b356b3daa4b7f0850754e5b89739daaf4dfba
+  metadata.gz: 16045824a8737f120ba0e57060bc936312d24c49
+  data.tar.gz: 8e71615acaa226eef9abb0c4dc2248e0b707a049
 SHA512:
-  metadata.gz: 12161c21f23669c889f91437c0b4979fb801f78ed015b8aa2b46b38d41b01782cfd7b0f4cd4548c1ecff0eb0e520dbe4230fe5269da1a5dc207ab2777674a299
-  data.tar.gz: bbe4051f32249124285e39426fc50075acc123865ad4e886ab875f65cbf2aad4cb27524f23c9d2b50791f323486d42cdcae07cd16d702f3c782caf841159ba29
+  metadata.gz: c2da530ae315278855bbb2c3e95c5acb29977f2f27ecac14eb3cf7834c4d08fb31a47da836b0e7d22b451b49896c46f8a328d4b6a4931350fd668e9dddbd8232
+  data.tar.gz: c8cba0fcfab582c66dc604b660680a3625b939e0f55e5bdfebada0be318c26615716e917452e40fb61ff3ec28c985853f55ffa1c0af8640db198d147924270f0

data/VERSION

@@ -1 +1 @@
-0.8.0.1
+0.8.1

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

@@ -19,6 +19,8 @@ module Kontena::Cli::Apps
     end
 
     def prefixed_name(name)
+      return name if service_prefix.strip == ""
+
       "#{service_prefix}-#{name}"
     end
 

data/lib/kontena/cli/containers/exec_command.rb

@@ -9,8 +9,9 @@ module Kontena::Cli::Containers
       require_api_url
       token = require_token
 
-      payload = {cmd: ['sh', '-c', cmd]}
-      result = client(token).post("containers/#{current_grid}/#{container_id}/exec", payload)
+      payload = {cmd: ['sh', '-c', cmd_list.join(' ')]}
+      service_name = container_id.match(/(.+)-(\d+)/)[1]
+      result = client(token).post("containers/#{current_grid}/#{service_name}/#{container_id}/exec", payload)
       puts result[0].join(" ") unless result[0].size == 0
       STDERR.puts result[1].join(" ") unless result[1].size == 0
       exit result[2]

data/lib/kontena/cli/deploy_command.rb

@@ -102,6 +102,8 @@ class Kontena::Cli::DeployCommand < Clamp::Command
   end
 
   def prefixed_name(name)
+    return name if service_prefix.strip == ""
+
     "#{service_prefix}-#{name}"
   end
 

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

@@ -14,6 +14,7 @@ module Kontena::Cli::Nodes
       puts "  id: #{node['id']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['updated_at']}"
+      puts "  last seen: #{node['last_seen_at']}"
       puts "  public ip: #{node['public_ip']}"
       puts "  private ip: #{node['private_ip']}"
       puts "  overlay network: 10.81.#{node['node_number']}.0/24"

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

@@ -10,9 +10,11 @@ module Kontena::Cli::Nodes
       require_current_grid
       token = require_token
 
+
+      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
       data = {}
       data[:labels] = label_list if label_list
-      client(token).put("grids/#{current_grid}/nodes/#{node_id}", data)
+      client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
     end
   end
 end

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

@@ -8,27 +8,19 @@ write_files:
       KONTENA_TOKEN="<%= grid_token %>"
       KONTENA_PEER_INTERFACE=eth1
       KONTENA_VERSION=<%= version %>
-  - path: /etc/systemd/system/docker.service.d/50-insecure-registry.conf
+  - 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"'
+  - path: /etc/resolv.conf
+    permissions: 0644
+    owner: root
+    content: |
+      nameserver 172.17.42.1
+      nameserver 8.8.8.8
+      nameserver 8.8.4.4
 coreos:
   units:
-    - name: 00-eth.network
-      runtime: true
-      content: |
-        [Match]
-        Name=eth*
-        [Network]
-        DHCP=yes
-        DNS=172.17.42.1
-        DNS=173.245.58.51
-        DNS=173.245.59.41
-        DNS=8.8.8.8
-        DOMAINS=kontena.local
-        [DHCP]
-        UseDNS=false
-
     - name: 10-weave.network
       runtime: false
       content: |

metadata

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