replace over-write with overwrite

pull/11366/head
Steven Powell 2021-05-11 14:56:33 -07:00
parent 8e696da904
commit 826f1852ab
10 changed files with 15 additions and 15 deletions

View File

@ -45,7 +45,7 @@ var (
pull bool pull bool
imgDaemon bool imgDaemon bool
imgRemote bool imgRemote bool
overWrite bool overwrite bool
tag string tag string
push bool push bool
dockerFile string dockerFile string
@ -131,7 +131,7 @@ var loadImageCmd = &cobra.Command{
if imgDaemon || imgRemote { if imgDaemon || imgRemote {
image.UseDaemon(imgDaemon) image.UseDaemon(imgDaemon)
image.UseRemote(imgRemote) image.UseRemote(imgRemote)
if err := machine.CacheAndLoadImages(args, []*config.Profile{profile}, overWrite); err != nil { if err := machine.CacheAndLoadImages(args, []*config.Profile{profile}, overwrite); err != nil {
exit.Error(reason.GuestImageLoad, "Failed to load image", err) exit.Error(reason.GuestImageLoad, "Failed to load image", err)
} }
} else if local { } else if local {
@ -249,7 +249,7 @@ func init() {
loadImageCmd.Flags().BoolVarP(&pull, "pull", "", false, "Pull the remote image (no caching)") loadImageCmd.Flags().BoolVarP(&pull, "pull", "", false, "Pull the remote image (no caching)")
loadImageCmd.Flags().BoolVar(&imgDaemon, "daemon", false, "Cache image from docker daemon") loadImageCmd.Flags().BoolVar(&imgDaemon, "daemon", false, "Cache image from docker daemon")
loadImageCmd.Flags().BoolVar(&imgRemote, "remote", false, "Cache image from remote registry") loadImageCmd.Flags().BoolVar(&imgRemote, "remote", false, "Cache image from remote registry")
loadImageCmd.Flags().BoolVar(&overWrite, "over-write", true, "Over write the existing image if the name:tag of the images are the same") loadImageCmd.Flags().BoolVar(&overwrite, "overwrite", true, "Overwrite the existing image if the name:tag of the images are the same")
imageCmd.AddCommand(loadImageCmd) imageCmd.AddCommand(loadImageCmd)
imageCmd.AddCommand(removeImageCmd) imageCmd.AddCommand(removeImageCmd)
buildImageCmd.Flags().StringVarP(&tag, "tag", "t", "", "Tag to apply to the new image (optional)") buildImageCmd.Flags().StringVarP(&tag, "tag", "t", "", "Tag to apply to the new image (optional)")

View File

@ -143,7 +143,7 @@ minikube image load image.tar
``` ```
--daemon Cache image from docker daemon --daemon Cache image from docker daemon
--over-write Over write the existing image if the name:tag of the images are the same (default true) --overwrite Overwrite the existing image if the name:tag of the images are the same (default true)
--pull Pull the remote image (no caching) --pull Pull the remote image (no caching)
--remote Cache image from remote registry --remote Cache image from remote registry
``` ```