提交 db5903d3 编写于 作者: M Medya Gh

lint

上级 54df61d6
......@@ -228,7 +228,7 @@ func (d *Driver) GetState() (state.State, error) {
// Kill stops a host forcefully, including any containers that we are managing.
func (d *Driver) Kill() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
return errors.Wrap(err, "point host docker daemon")
}
cmd := exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName)
if err := cmd.Run(); err != nil {
......@@ -240,7 +240,7 @@ func (d *Driver) Kill() error {
// Remove will delete the Kic Node Container
func (d *Driver) Remove() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
return errors.Wrap(err, "point host docker daemon")
}
if _, err := oci.ContainerID(d.OCIBinary, d.MachineName); err != nil {
......@@ -261,7 +261,7 @@ func (d *Driver) Remove() error {
// Restart a host
func (d *Driver) Restart() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
return errors.Wrap(err, "point host docker daemon")
}
s, err := d.GetState()
if err != nil {
......@@ -287,7 +287,7 @@ func (d *Driver) Restart() error {
// not meant to be used for Create().
func (d *Driver) Start() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
return errors.Wrap(err, "point host docker daemon")
}
s, err := d.GetState()
if err != nil {
......@@ -307,7 +307,7 @@ func (d *Driver) Start() error {
// Stop a host gracefully, including any containers that we are managing.
func (d *Driver) Stop() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
return errors.Wrap(err, "point host docker daemon")
}
cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
if err := cmd.Run(); err != nil {
......
......@@ -156,7 +156,8 @@ func warnToReEvalEnv(drver string, name string) {
p := os.Getenv(constants.MinikubeActiveDockerdEnv)
if p != "" {
out.T(out.WarningType, "dockerd port changed since restart. minikube's docker-env need to be updated.")
out.T(out.WarningType, "Please run the following command: 'minikube -p {{.profile_name}} docker-env'", out.V{"profile_name": name})
out.T(out.WarningType, `Please run the following command:
'minikube -p {{.profile_name}} docker-env'`, out.V{"profile_name": name})
}
return
}
......
......@@ -63,7 +63,7 @@ func status() registry.State {
return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"}
}
if err := PointToHostDockerDaemon(); err != nil {
if err := oci.PointToHostDockerDaemon(); err != nil {
return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Failed to point to dockerd. Please make sure DOCKER_HOST environment variable is pointing to your installed dockerd."}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册