dory 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/dory +9 -0
- data/lib/dory/docker_service.rb +5 -5
- data/lib/dory/version.rb +2 -2
- metadata +3 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 78281e4844cc2720db9d465be198522dd0a89b83
|
|
4
|
+
data.tar.gz: 0aff6a8d3ca04ab8cbd999834031f131015f6595
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d5e3972cfea9164e794ce7e85606c542fe44f3a8b36d92639054e8ebd017e4ebc097cd0e9391f622242fdcbce39b178975de6ea246944271f57e67827632e278
|
|
7
|
+
data.tar.gz: 78cf5d4c8161b9290b1c8b751cdfcb187ea2aa272f7d2b5ea6a81c3a4f6e9bbc0adb1c2b954d87e9408a40fd95c0deb2c64f6848d8d1e37802a071b08edc3673
|
data/bin/dory
CHANGED
|
@@ -132,6 +132,15 @@ class DoryBin < Thor
|
|
|
132
132
|
servs = services.empty? ? %w[proxy dns] : services
|
|
133
133
|
servs = sanitize_services(servs)
|
|
134
134
|
return unless servs
|
|
135
|
+
|
|
136
|
+
unless Dory::DockerService.docker_installed?
|
|
137
|
+
puts "Docker does not appear to be installed /o\\".red
|
|
138
|
+
puts "Docker is required for DNS and Nginx proxy. These can be " \
|
|
139
|
+
"disabled in the config file if you don't need them.\n".yellow
|
|
140
|
+
puts "Please install docker and try again".red
|
|
141
|
+
return
|
|
142
|
+
end
|
|
143
|
+
|
|
135
144
|
servs.each do |service|
|
|
136
145
|
imgname = if service == 'proxy'
|
|
137
146
|
Dory::Proxy.dory_http_proxy_image_name
|
data/lib/dory/docker_service.rb
CHANGED
|
@@ -3,10 +3,14 @@ require 'ostruct'
|
|
|
3
3
|
|
|
4
4
|
module Dory
|
|
5
5
|
module DockerService
|
|
6
|
-
def docker_installed?
|
|
6
|
+
def self.docker_installed?
|
|
7
7
|
Sh.run_command('which docker').success?
|
|
8
8
|
end
|
|
9
9
|
|
|
10
|
+
def docker_installed?
|
|
11
|
+
Dory::DockerService.docker_installed?
|
|
12
|
+
end
|
|
13
|
+
|
|
10
14
|
def run_preconditions
|
|
11
15
|
# Override if preconditions are needed
|
|
12
16
|
return true
|
|
@@ -73,10 +77,6 @@ module Dory
|
|
|
73
77
|
end
|
|
74
78
|
end
|
|
75
79
|
|
|
76
|
-
def has_docker_client?
|
|
77
|
-
Sh.run_command('which docker').success?
|
|
78
|
-
end
|
|
79
|
-
|
|
80
80
|
def stop(container_name = self.container_name)
|
|
81
81
|
Sh.run_command("docker kill #{Shellwords.escape(container_name)}") if self.running?
|
|
82
82
|
!self.running?
|
data/lib/dory/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dory
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Porter
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-02-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colorize
|
|
@@ -167,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
167
167
|
version: '0'
|
|
168
168
|
requirements: []
|
|
169
169
|
rubyforge_project:
|
|
170
|
-
rubygems_version: 2.2
|
|
170
|
+
rubygems_version: 2.5.2
|
|
171
171
|
signing_key:
|
|
172
172
|
specification_version: 4
|
|
173
173
|
summary: Your development proxy for Docker
|
|
174
174
|
test_files: []
|
|
175
|
-
has_rdoc:
|