Skip to content

Commit ddd07d0

Browse files
committed
Fix contributor links.
1 parent 6a4ef23 commit ddd07d0

File tree

5 files changed

+17
-2
lines changed

5 files changed

+17
-2
lines changed

CONTRIBUTORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Your name could be here!
1414
* [Mark Borcherding][markborcherding]
1515
* [Nick Laferriere][laferrieren]
1616
* [Hugo Chinchilla][hugochinchilla]
17+
* [Dan Selans][dselans]
18+
* [Dan Young][idleyoungman]
1719

1820
Pre-release
1921
-----------

lib/centurion/docker_server.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ class Centurion::DockerServer
2121
def initialize(host, docker_path, tls_params = {})
2222
@docker_path = docker_path
2323
@hostname, @port = host.split(':')
24-
@port ||= '2375'
24+
@port ||= if tls_params.empty?
25+
'2375'
26+
else
27+
'2376'
28+
end
2529
@tls_params = tls_params
2630
end
2731

lib/centurion/docker_via_api.rb

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def configure_excon_globally
152152
Excon.defaults[:nonblock] = false
153153
Excon.defaults[:tcp_nodelay] = true
154154
Excon.defaults[:ssl_ca_file] = @tls_args[:tlscacert]
155+
Excon.defaults[:ssl_verify_peer] = false
155156
end
156157

157158
def default_tls_args(tls_enabled)

lib/centurion/docker_via_cli.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def tls_parameters
6868

6969
def build_command(action, destination)
7070
command = "#{@docker_path} -H=#{@docker_host}"
71-
command << tls_parameters
71+
command << tls_parameters || ''
7272
command << case action
7373
when :pull then ' pull '
7474
when :logs then ' logs -f '

lib/tasks/deploy.rake

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ end
3131

3232
task :stop => ['deploy:stop']
3333
task :enter_container => ['deploy:enter_container']
34+
task :logs => ['deploy:logs']
3435

3536
namespace :dev do
3637
task :export_only do
@@ -125,6 +126,13 @@ namespace :deploy do
125126
end
126127
end
127128

129+
task :logs do
130+
Centurion::DockerServerGroup.new(fetch(:hosts, []), fetch(:docker_path)).each_in_parallel do |host|
131+
container_id = host.ps.select { |c| c['Names'].select { |n| n =~ /#{fetch(:name)}/ } }.first['Id']
132+
host.tail(container_id)
133+
end
134+
end
135+
128136
task :rolling_deploy do
129137
on_each_docker_host do |server|
130138
service = defined_service

0 commit comments

Comments
 (0)