fix for docker_service not containing a listening socket

Signed-off-by: Chase Bolt <[email protected]>
hynd · Aug 4, 2017 · 5262ae1 · 5262ae1
1 parent 021080e
commit 5262ae1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/libraries/docker_service_manager_systemd.rb b/libraries/docker_service_manager_systemd.rb
@@ -29,8 +29,9 @@ class DockerServiceManagerSystemd < DockerServiceBase
         variables(
           config: new_resource,
           docker_name: docker_name,
-          docker_socket: connect_socket.sub(%r{unix://|fd://}, '')
+          docker_socket: connect_socket
         )
+        action connect_socket.nil? ? :delete : :create
         not_if { docker_name == 'default' && ::File.exist?('/lib/systemd/system/docker.socket') }
       end
 
@@ -43,7 +44,8 @@ class DockerServiceManagerSystemd < DockerServiceBase
         mode '0644'
         variables(
           docker_name: docker_name,
-          docker_daemon_cmd: docker_daemon_cmd
+          docker_daemon_cmd: docker_daemon_cmd,
+          docker_socket: connect_socket
         )
         not_if { docker_name == 'default' && ::File.exist?('/lib/systemd/system/docker.service') }
       end
@@ -58,8 +60,9 @@ class DockerServiceManagerSystemd < DockerServiceBase
         variables(
           config: new_resource,
           docker_name: docker_name,
-          docker_socket: connect_socket.sub(%r{unix://|fd://}, '')
+          docker_socket: connect_socket
         )
+        action connect_socket.nil? ? :delete : :create
       end
 
       # this overrides the main systemd service
@@ -72,6 +75,7 @@ class DockerServiceManagerSystemd < DockerServiceBase
         variables(
           config: new_resource,
           docker_name: docker_name,
+          docker_socket: connect_socket,
           docker_daemon_cmd: docker_daemon_cmd,
           systemd_args: systemd_args,
           docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"

diff --git a/libraries/docker_service_manager_upstart.rb b/libraries/docker_service_manager_upstart.rb
@@ -24,7 +24,7 @@ class DockerServiceManagerUpstart < DockerServiceBase
           docker_daemon_cmd: [dockerd_bin_link, docker_daemon_arg, docker_daemon_opts].join(' '),
           docker_raw_logs_arg: docker_raw_logs_arg,
           docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready",
-          docker_socket: connect_socket.sub(%r{unix://|fd://}, '')
+          docker_socket: connect_socket
         )
         notifies :restart, "service[#{docker_name}]", :immediately
       end

diff --git a/libraries/helpers_service.rb b/libraries/helpers_service.rb
@@ -76,6 +76,7 @@ def connect_host
 
       def connect_socket
         return "/var/run/#{docker_name}.sock" unless host
+        return nil if host.grep(%r{unix://|fd://}).empty?
         sorted = coerce_host(host).sort do |a, b|
           c_a = 1 if a =~ /^unix:/
           c_a = 2 if a =~ /^fd:/
@@ -85,7 +86,7 @@ def connect_socket
           c_b = 3 unless c_b
           c_a <=> c_b
         end
-        sorted.first
+        sorted.first.sub(%r{unix://|fd://}, '')
       end
 
       def coerce_host(v)

diff --git a/templates/default/systemd/docker.service-override.erb b/templates/default/systemd/docker.service-override.erb
@@ -1,9 +1,13 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
+<% if @docker_socket.nil? %>
+After=network-online.target firewalld.service
+<% else %>
 After=network-online.target <%= @docker_name %>.socket firewalld.service
-Wants=network-online.target
 Requires=<%= @docker_name %>.socket
+<% end %>
+Wants=network-online.target
 
 [Service]
 Type=notify

diff --git a/templates/default/systemd/docker.service.erb b/templates/default/systemd/docker.service.erb
@@ -1,9 +1,13 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
+<% if @docker_socket.nil? %>
+After=network-online.target firewalld.service
+<% else %>
 After=network-online.target <%= @docker_name %>.socket firewalld.service
-Wants=network-online.target
 Requires=<%= @docker_name %>.socket
+<% end %>
+Wants=network-online.target
 
 [Service]
 Type=notify