dapp 0.21.9 → 0.21.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa2ee011d29f304455d8f53757c9bf802c18c4d
-  data.tar.gz: 7974db60e66f691ad5ac65e70078823016f3f9e4
+  metadata.gz: 84d84e0532287de87c019d7510a9c335bc9c18cb
+  data.tar.gz: f94268cbc49f418b377608ee1a83c884ce7fc56a
 SHA512:
-  metadata.gz: 292259aefea6591fb87f5b737481d51247a8efcde8edc132347367f8ba4c9003710305c54405075b47b148b6ca1f3cbf8f7b27bae7ae25434cdc874fe3f78677
-  data.tar.gz: 9d3bc96560b03a9415457ea233f4247466f9cd6d52583176e1dd873c458c2fd7b80ea5443a9d216a0b0f91d9c0731588b82bd5cce9ea9c5ee4b13779f39c8255
+  metadata.gz: f6fa6536f7c36ea9d73785cb35255e2e76efeabf53675d4f00ec8c62c7f1b6f7dcbe4d7f6dd640a6cff7ffda06f52b2a1bb1ba4013a7b5d89d4521ecf2c0700d
+  data.tar.gz: f8fa38c9a247fb2796c2328823e0d8b0d24e2111a75f6688702b980a068f5991bf4d729400803fbe2e1ea3bced53f315f0032902c15dfab60b320f4e78107d56

data/config/en/net_status.yml

@@ -51,7 +51,7 @@ en:
       cannot_run_ssh_agent: "Can't run ssh-agent!"
       ssh_key_not_found: "Ssh key `%{path}` doesn't exist!"
       docker_not_found: "Docker not found!"
-      docker_version: "Required docker version (`%{version}`): `%{min_version}` <= VERSION <= `%{max_version}`!"
+      docker_version: "Required docker version (`%{version}`): VERSION must be newer than `%{min_version}`!"
       dapp_config_file_incorrect: "%{message}"
       yaml_file_incorrect: "Yaml file `%{file}`: `%{message}`"
       yaml_incorrect: "`%{message}`"

data/lib/dapp/dapp.rb

@@ -142,15 +142,12 @@ module Dapp
           raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
           docker_bin = res.stdout.strip
 
-          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
-          required_min_docker_version = '1.10.0'
-          required_max_docker_version = '17.09.0'
-
-          if Gem::Version.new(required_min_docker_version) > Gem::Version.new(current_docker_version[/(\d+\.)+\d+/]) ||
-              Gem::Version.new(required_max_docker_version) < Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
-            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version,
-                                                              max_version: required_max_docker_version,
-                                                              version: current_docker_version[/(\d+\.)+\d+/] }
+          current_docker_version = Gem::Version.new(shellout!("#{docker_bin} --version").stdout.strip[/(\d+\.)+\d+(?=\.\d+)/])
+          required_min_docker_version = Gem::Version.new('1.10')
+
+          if required_min_docker_version >= current_docker_version
+            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version.to_s,
+                                                              version: current_docker_version.to_s }
           end
 
           [].tap do |cmd|

data/lib/dapp/dimg/image/argument.rb

@@ -65,7 +65,9 @@ module Dapp
         def prepare_instructions(options)
           options.map do |key, vals|
             case key
-            when :cmd, :entrypoint then [vals]
+            when :cmd, :entrypoint
+              vals = [''] if vals == []
+              [vals]
             when :env, :label then vals.map(&method(:options_to_args)).flatten
             else vals
             end.map { |val| %(#{key.to_s.upcase} #{val}) }

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.21.9'.freeze
+  VERSION = '0.21.10'.freeze
   BUILD_CACHE_VERSION = 24.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.9
+  version: 0.21.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout