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

Change exit to warning if can't restart docker in docker-env cmd #10028

Merged
merged 2 commits into from
Dec 24, 2020
Merged

Change exit to warning if can't restart docker in docker-env cmd #10028

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6460b61
Change exit to warning if can't restart docker in docker-env cmd
azhao155 Dec 23, 2020
6818114
Add error in the log
azhao155 Dec 23, 2020
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
3 changes: 2 additions & 1 deletion cmd/minikube/cmd/docker-env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ func mustRestartDockerd(name string, runner command.Runner) {
if err := sysinit.New(runner).Reload("docker"); err != nil {
klog.Warningf("will try to restart dockerd because reload failed: %v", err)
if err := sysinit.New(runner).Restart("docker"); err != nil {
exit.Message(reason.RuntimeRestart, `The Docker service within '{{.name}}' is not active`, out.V{"name": name})
klog.Warningf("Couldn't restart docker inside minikbue within '%v' because: %v", name, err)
return
}
// if we get to the point that we have to restart docker (instead of reload)
// will need to wait for apisever container to come up, this usually takes 5 seconds
Expand Down