kontena-cli 1.2.0.rc3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275e980674a2ede2275a9174f4ecf26b8e1f758c
-  data.tar.gz: 13211f91abe692ca430e945788295d20dec4a65d
+  metadata.gz: 9bc00d0ec3050b6dd80e0c193ee9a09499137c06
+  data.tar.gz: 51ba8dd82496286ec9751eb52a83a00d15cd99eb
 SHA512:
-  metadata.gz: 9aacc4e52361e78ca2e3fad493600fea03c05a4ddfcb963db341474bb69d50c161fe569221e46e300d46931a85bd635134be075a6d0fee458e13abaa1eeb2247
-  data.tar.gz: fa637d37be4ea80011b05c94d248a9415e0c973e1a0b45fda94eadaab155df174ad2369ac6e55bc86e2037c0ab7723357a42442968ce1288d0a9c26bbd2e6b89
+  metadata.gz: e7b5f3297c6f8f7fddcfc10bea2c648f310588ed198ecac836ce1153178c76953d23be9b8e1950aa1d4d780f0d4f7cb5e3638a4044852420fc1a59227a01da78
+  data.tar.gz: a92ebc69b4e0eff2aadccaf1c1cefe54117ddca15dafd7d2a1196e6ede3dcbef0b836bb570e6227df9a3e9f6972be8a7ca644fc71c66ca9c2efe6fc3076a8d8c

data/VERSION

@@ -1 +1 @@
-1.2.0.rc3
+1.2.0

data/lib/kontena/cli/stacks/stacks_helper.rb

@@ -1,4 +1,3 @@
-
 module Kontena::Cli::Stacks
   module StacksHelper
 
@@ -52,7 +51,13 @@ module Kontena::Cli::Stacks
         if deployment['state'] == 'error'
           deployment['service_deploys'].each do |service_deploy|
             if service_deploy['state'] == 'error'
-              error service_deploy['reason']
+              $stderr.puts "Deployment of service #{pastel.cyan(service_deploy['service_id'])} failed:"
+              $stderr.puts "  - #{service_deploy['reason'].strip}"
+              service_deploy['instance_deploys'].each do |instance_deploy|
+                if instance_deploy['state'] == 'error'
+                  $stderr.puts "  - " + "#{instance_deploy['error'].strip} (on node #{pastel.cyan(instance_deploy['node'])})"
+                end
+              end
             end
           end
           abort
@@ -67,11 +72,12 @@ module Kontena::Cli::Stacks
     def wait_for_service_deploy(service_deploy, states)
       service_deployed = false
       name = service_deploy['service_id'].split('/')[-1]
-      spinner "Deploying service #{pastel.cyan(name)}" do
+      spinner "Deploying service #{pastel.cyan(name)}" do |spin|
         until service_deployed
           r = client.get("services/#{service_deploy['service_id']}/deploys/#{service_deploy['id']}")
           if states.include?(r['state'])
             service_deployed = true
+            spin.fail if r['state'] == 'error'
           else
             sleep 1
           end

data/lib/kontena/cli/stacks/yaml/validator_v3.rb

@@ -67,7 +67,7 @@ module Kontena::Cli::Stacks
                     unless mount_point
                       result[:errors] << { 'services' => { service => { 'volumes' => { volume => 'mount point missing' } } } }
                     end
-                    if volume_name
+                    if volume_name && !volume_name.start_with?('/')
                       if yaml.key?('volumes')
                         unless yaml['volumes'][volume_name]
                           result[:errors] << { 'services' => { service => { 'volumes' => { volume_name => 'not found in top level volumes list' } } } }

data/spec/kontena/cli/stacks/yaml/validator_v3_spec.rb

@@ -304,4 +304,75 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
       end
     end
   end
+
+  describe '#validate' do
+
+    context 'volumes' do
+      let(:stack) do
+        {
+          'stack' => 'a-stack',
+          'services' => {
+            'foo' => {
+              'volumes' => [
+                'foo:/app'
+              ]
+            }
+          },
+          'volumes' => {
+
+          }
+
+        }
+      end
+      it 'fails validation if volumes are not declared' do
+        result = subject.validate(stack)
+        expect(result[:errors]).not_to be_empty
+      end
+
+      it 'validation succeeds if volumes are declared' do
+        stack['volumes'] = {
+          'foo' => {
+            'external' => true
+          }
+        }
+        result = subject.validate(stack)
+        expect(result[:errors]).to be_empty
+      end
+
+      it 'validation fails when external: false' do
+        stack['volumes'] = {
+          'foo' => {
+            'external' => false
+          }
+        }
+        result = subject.validate(stack)
+        expect(result[:errors]).not_to be_empty
+      end
+
+      it 'validation succeeds if volumes are declared' do
+        stack['volumes'] = {
+          'foo' => {
+            'external' => {
+              'name' => 'foobar'
+            }
+          }
+        }
+        result = subject.validate(stack)
+        expect(result[:errors]).to be_empty
+      end
+
+      it 'bind mount do not need ext volumes' do
+        stack['services']['foo']['volumes'] = ['/var/run/docker.sock:/var/run/docker.sock']
+        result = subject.validate(stack)
+        expect(result[:errors]).to be_empty
+      end
+
+      it 'anon vols do not need ext volumes' do
+        stack['services']['foo']['volumes'] = ['/data']
+        result = subject.validate(stack)
+        expect(result[:errors]).to be_empty
+      end
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc3
+  version: 1.2.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -661,9 +661,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8