pygmy 0.9.10 → 0.9.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/pygmy +2 -2
- data/lib/pygmy/amazee.rb +17 -4
- data/lib/pygmy/dnsmasq.rb +2 -2
- data/lib/pygmy/resolv_osx.rb +1 -1
- data/lib/pygmy/version.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fc64b47fe8d582a95977f3146c7be36a1616b94f
|
4
|
+
data.tar.gz: 3b3a8005b4a7a9ee55aa077f4d9b89b06c9fb546
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 96dbdc3d3b98ec064708cf51c4de5559f25d0448138107cef636e5d7c16a7d54812ee8c6f798663fa5beea61a81963d9612f0c8078ee324599af64a51a455568
|
7
|
+
data.tar.gz: 4a78c85c6c9954a851c299816ae94275ea44a3d835f183196d69a3696c8abfae8673515e24a9bb9835d258de23c1a647b8bdff4bd4ca57262507c8a0692e3cb9
|
data/bin/pygmy
CHANGED
@@ -170,7 +170,7 @@ class PygmyBin < Thor
|
|
170
170
|
if Pygmy::SshAgentAddKey.add_ssh_key
|
171
171
|
puts "Successfully injected ssh key".green
|
172
172
|
else
|
173
|
-
puts "Error
|
173
|
+
puts "Error injecting ssh key".red
|
174
174
|
end
|
175
175
|
end
|
176
176
|
end
|
@@ -229,7 +229,7 @@ class PygmyBin < Thor
|
|
229
229
|
if Pygmy::SshAgentAddKey.add_ssh_key(key)
|
230
230
|
puts "Successfully added ssh key".green
|
231
231
|
else
|
232
|
-
puts "Error
|
232
|
+
puts "Error adding ssh key".red
|
233
233
|
end
|
234
234
|
else
|
235
235
|
puts "ssh-agent is not running, cannot add key".red
|
data/lib/pygmy/amazee.rb
CHANGED
@@ -1,9 +1,18 @@
|
|
1
1
|
require_relative 'docker_service'
|
2
|
+
require 'colorize'
|
2
3
|
|
3
4
|
module Pygmy
|
4
5
|
class Amazee
|
5
6
|
extend Pygmy::DockerService
|
6
7
|
|
8
|
+
def self.prefix
|
9
|
+
"amazeeio/"
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.ignore_list
|
13
|
+
%w(none ssh-agent haproxy)
|
14
|
+
end
|
15
|
+
|
7
16
|
def self.pull(image_name)
|
8
17
|
puts "Pulling Docker Image #{Shellwords.escape(image_name)}".yellow
|
9
18
|
pull_cmd = "docker pull #{Shellwords.escape(image_name)}"
|
@@ -26,11 +35,15 @@ module Pygmy
|
|
26
35
|
amazee_containers = []
|
27
36
|
containers.each do |container|
|
28
37
|
# Selectively target amazeeio/* images.
|
29
|
-
if container.include?(
|
38
|
+
if container.include?(self.prefix)
|
39
|
+
include_container = true
|
30
40
|
# Filter out items which we don't want.
|
31
|
-
|
32
|
-
|
41
|
+
self.ignore_list.each do |item|
|
42
|
+
if container.include?(item)
|
43
|
+
include_container = false
|
44
|
+
end
|
33
45
|
end
|
46
|
+
amazee_containers.push(container) if include_container
|
34
47
|
end
|
35
48
|
end
|
36
49
|
amazee_containers
|
@@ -40,7 +53,7 @@ module Pygmy
|
|
40
53
|
list = self.ls_cmd
|
41
54
|
unless list.nil?
|
42
55
|
list.each do |image|
|
43
|
-
pull(image)
|
56
|
+
self.pull(image)
|
44
57
|
end
|
45
58
|
end
|
46
59
|
end
|
data/lib/pygmy/dnsmasq.rb
CHANGED
@@ -5,7 +5,7 @@ module Pygmy
|
|
5
5
|
extend Pygmy::DockerService
|
6
6
|
|
7
7
|
def self.image_name
|
8
|
-
'andyshinn/dnsmasq:2.
|
8
|
+
'andyshinn/dnsmasq:2.78'
|
9
9
|
end
|
10
10
|
|
11
11
|
def self.container_name
|
@@ -21,7 +21,7 @@ module Pygmy
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def self.run_cmd(domain = self.domain, addr = self.addr)
|
24
|
-
"docker run -d -p
|
24
|
+
"docker run -d -p 6053:53/tcp -p 6053:53/udp --name=#{Shellwords.escape(self.container_name)} " \
|
25
25
|
"--cap-add=NET_ADMIN #{Shellwords.escape(self.image_name)} -A /#{Shellwords.escape(domain)}/#{Shellwords.escape(addr)}"
|
26
26
|
end
|
27
27
|
end
|
data/lib/pygmy/resolv_osx.rb
CHANGED
data/lib/pygmy/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pygmy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Schmid
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-08-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: colorize
|