kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove duplicate setDockerProxy

pull/7449/head
Medya Gh 2020-04-06 04:06:43 -07:00
parent 5517e2b03b
commit ee1f8fffb3
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/minikube/cmd/start_flags.go
View File

@ -179,11 +179,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}
// Feed Docker our host proxy environment by default, so that it can pull images
if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
setDockerProxy()
}
if cmd.Flags().Changed(imageRepository) {
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}
@ -280,7 +275,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
}
// Feed Docker our host proxy environment by default, so that it can pull images
// redoing setDockerProxy in case proxy changed since last start.
// doing this for both new config and existing, in case proxy changed since previous start
if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
setDockerProxy()
}