From 6f909684e79954c2e67a6377ec8128ca05c388d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 20 Jan 2019 15:22:37 +0100 Subject: [PATCH] Still generate docker.service unit, even if unused The dynamically generated docker.service file should still be there, otherwise the statically provided docker.socket file gets confused. --- pkg/provision/buildroot.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go index ef1732dccd1c..a139114f93bc 100644 --- a/pkg/provision/buildroot.go +++ b/pkg/provision/buildroot.go @@ -294,10 +294,6 @@ func configureAuth(p *BuildrootProvisioner) error { return errors.Wrap(err, "getting cluster config") } - if config.MachineConfig.ContainerRuntime != "" { - return nil - } - dockerCfg, err := p.GenerateDockerOptions(engine.DefaultPort) if err != nil { return errors.Wrap(err, "generating docker options") @@ -309,12 +305,15 @@ func configureAuth(p *BuildrootProvisioner) error { return err } - if err := p.Service("docker", serviceaction.Enable); err != nil { - return err - } + if config.MachineConfig.ContainerRuntime == "" { - if err := p.Service("docker", serviceaction.Restart); err != nil { - return err + if err := p.Service("docker", serviceaction.Enable); err != nil { + return err + } + + if err := p.Service("docker", serviceaction.Restart); err != nil { + return err + } } return nil