Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Still generate docker.service unit, even if unused #3560

Merged
merged 1 commit into from
Jan 25, 2019
Merged

Still generate docker.service unit, even if unused #3560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions pkg/provision/buildroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down