From 9730c20c96c6ed911d9ae60c77aba088a1ce8230 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Fri, 28 Jul 2017 15:15:29 +0200 Subject: [PATCH] Set DOCKERBINARY in sysconfig to docker_command This will allow compatibility with the centos packages, where: /usr/bin/docker: a script sourcing /etc/sysconfig/docker and docker-client and docker-client-latest packages install /usr/bin/docker-current and /usr/bin/docker-latest, respectively. Setting DOCKERBINARY in sysconfig defines which of the pkgs should be used. --- templates/etc/conf.d/docker.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/etc/conf.d/docker.erb b/templates/etc/conf.d/docker.erb index a5092d344..569e65d5d 100644 --- a/templates/etc/conf.d/docker.erb +++ b/templates/etc/conf.d/docker.erb @@ -2,6 +2,7 @@ # may be overwritten DOCKER="/usr/bin/<%= @docker_command %>" +DOCKERBINARY="/usr/bin/<%= @docker_command %>" other_args="<% -%> <% if @root_dir %> -g <%= @root_dir %><% end -%>