Add registry addon feature for docker on mac/windows

pkg/addons/addons.go

@@ -176,6 +176,16 @@ https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Dri
 		return nil
 	}
 
+	if name == "registry" {
+		port, err := machine.RegistryPort(cc)
+		if err != nil {
+			errors.Wrap(err, "Can't get Registry port")
+		}
+		if runtime.GOOS != "linux" {
+			out.T(out.Notice, `This is the port you should use for the registry addon "{{.port}}"`, out.V{"port": port})
+		}
+	}
+
 	cmd, err := machine.CommandRunner(host)
 	if err != nil {
 		return errors.Wrap(err, "command runner")

pkg/drivers/kic/kic.go

@@ -18,6 +18,7 @@ package kic
 
 import (
 	"fmt"
+	"k8s.io/minikube/pkg/minikube/config"
 	"net"
 	"os/exec"
 	"strconv"
@@ -93,6 +94,10 @@ func (d *Driver) Create() error {
 			ListenAddress: oci.DefaultBindIPV4,
 			ContainerPort: constants.DockerDaemonPort,
 		},
+		oci.PortMapping{
+			ListenAddress: oci.DefaultBindIPV4,
+			ContainerPort: constants.RegistryAddonPort,
+		},
 	)
 
 	exists, err := oci.ContainerExists(d.OCIBinary, params.Name)
@@ -203,6 +208,15 @@ func (d *Driver) GetSSHPort() (int, error) {
 	return p, nil
 }
 
+// GetRegistryAddonPort returns port for use with registry
+func GetRegistryAddonPort(cc *config.ClusterConfig) (int, error) {
+	p, err := oci.ForwardedPort(cc.Driver, cc.Name, constants.RegistryAddonPort)
+	if err != nil {
+		return p, errors.Wrap(err, "get registry port")
+	}
+	return p, nil
+}
+
 // GetSSHUsername returns the ssh username
 func (d *Driver) GetSSHUsername() string {
 	return "docker"

pkg/minikube/constants/constants.go

@@ -40,6 +40,8 @@ const (
 	APIServerPort = 8443
 	// SSHPort is the SSH serviceport on the node vm and container
 	SSHPort = 22
+	// RegistryAddonPort os the default registry addon port
+	RegistryAddonPort = 5000
 
 	// APIServerName is the default API server name
 	APIServerName = "minikubeCA"

pkg/minikube/machine/client.go

@@ -20,6 +20,9 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
+	"k8s.io/minikube/pkg/drivers/kic"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
 	"net"
 	"os"
 	"path/filepath"
@@ -169,6 +172,20 @@ func SSHRunner(h *host.Host) (command.Runner, error) {
 	return command.NewSSHRunner(client), nil
 }
 
+
+// RegistryPort return registry addon port
+func RegistryPort(cc *config.ClusterConfig) (int, error) {
+	if driver.IsKIC(cc.Driver) {
+		registryPort, err := kic.GetRegistryAddonPort(cc)
+		if err != nil {
+			errors.Wrap(err, "failed to get Registry port")
+		}
+		return registryPort, nil
+	}
+	return constants.RegistryAddonPort, nil
+}
+
+
 // Create creates the host
 func (api *LocalClient) Create(h *host.Host) error {
 	glog.Infof("LocalClient.Create starting")