Dockerd binary on 1.12+ for upstart (sous-chefs#741)

d4n13lbc · Aug 29, 2016 · c35ca65 · c35ca65
1 parent 57d0fb5
commit c35ca65
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/libraries/docker_service_manager_upstart.rb b/libraries/docker_service_manager_upstart.rb
@@ -26,6 +26,7 @@ class DockerServiceManagerUpstart < DockerServiceBase
         source 'default/docker.erb'
         variables(
           config: new_resource,
+          docker_daemon: docker_daemon,
           docker_daemon_opts: docker_daemon_opts.join(' ')
         )
         cookbook 'docker'

diff --git a/libraries/helpers_service.rb b/libraries/helpers_service.rb
@@ -123,6 +123,14 @@ def docker_major_version
         ray.push.join('.')
       end
 
+      def docker_daemon
+        if Gem::Version.new(docker_major_version) < Gem::Version.new('1.12')
+          docker_bin
+        else
+          dockerd_bin
+        end
+      end
+
       def docker_daemon_arg
         if Gem::Version.new(docker_major_version) < Gem::Version.new('1.8')
           '-d'
@@ -134,12 +142,7 @@ def docker_daemon_arg
       end
 
       def docker_daemon_cmd
-        bin = if Gem::Version.new(docker_major_version) < Gem::Version.new('1.12')
-                docker_bin
-              else
-                dockerd_bin
-              end
-        [bin, docker_daemon_arg, docker_daemon_opts].join(' ')
+        [docker_daemon, docker_daemon_arg, docker_daemon_opts].join(' ')
       end
 
       def docker_cmd

diff --git a/templates/default/default/docker.erb b/templates/default/default/docker.erb
@@ -1,7 +1,7 @@
 # Docker Upstart and SysVinit configuration file
 
 # Customize location of Docker binary (especially for development testing).
-DOCKER="<%= @config.docker_bin %>"
+DOCKER="<%= @docker_daemon %>"
 
 # Use DOCKER_OPTS to modify the daemon startup options.
 DOCKER_OPTS="<%= @docker_daemon_opts %>"