@@ -14,7 +14,7 @@ Getting Started

 ---------------

 You can develop [locally on your host](CONTRIBUTING.adoc#develop-locally-on-your-host) or with a [virtual machine](CONTRIBUTING.adoc#develop-on-virtual-machine-using-vagrant), or if you want to just try out OpenShift [download the latest Linux 64bit pre-built binary](CONTRIBUTING.adoc#download-from-github).

-First, **get up and running with the** [**Contributing Guide**](CONTRIBUTING.adoc). 

+First, **get up and running with the** [**Contributing Guide**](CONTRIBUTING.adoc).

 Once setup, you can:

@@ -49,6 +49,26 @@ This example is simply running the ['openshift/hello-openshift' Docker image](ht

 Remember, you can pass a URL to `-c` when using the `kube` command, so you can [download the latest release](CONTRIBUTING.adoc#download-from-github) and pass a URL to the content on GitHub so you don't even need clone the source.

+### Docker registry

+

+OpenShift builds allow pushing built images into docker registry. Currently we only support one registry per OpenShift installation.

+Still you can use either private [docker registry](https://github.com/docker/docker-registry) or the [official docker hub](https://hub.docker.com/).

+

+**Private docker registry**

+

+To setup private docker registry you can either follow the steps [here](https://github.com/docker/docker-registry#quick-start)

+or use [simple-ruby-app example](https://github.com/openshift/origin/blob/master/examples/simple-ruby-app)

+to host one inside OpenShift. Afterwards you need to pass `DOCKER_REGISTRY` environment variable to `openshift start`

+command, specifying the address of your registry, e.g. `DOCKER_REGISTRY=localhost:5000`.

+

+**Docker Hub**

+

+To access the [official docker hub](https://hub.docker.com/) you need to login using `docker login` command.

+In result a file named `.dockercfg` is created in your home directory. It contains credentials used

+when accessing the hub. Now when running OpenShift, the binary will pick up these credentials and

+use them inside build pods to push your result images to the hub.

+

+NOTE: Make sure to tag your build appropriately to match hub requirements, meaning `username/imagename`.

 Design Documents

 ----------------

@@ -16,6 +16,6 @@ fi

 docker build --rm -t $TAG $DOCKER_CONTEXT_URL

-if [ -n "$DOCKER_REGISTRY" ]; then

+if [ -n "$DOCKER_REGISTRY" ] || [ -s "/.dockercfg" ]; then

   docker push $TAG

 fi

@@ -17,9 +17,9 @@ if [ -n "$SOURCE_REF" ]; then

   REF_OPTION="--ref $SOURCE_REF"

 fi

-BUILD_TEMP_DIR=${TEMP_DIR-$TMPDIR} 

+BUILD_TEMP_DIR=${TEMP_DIR-$TMPDIR}

 TMPDIR=$BUILD_TEMP_DIR sti build $SOURCE_URI $BUILDER_IMAGE $TAG $REF_OPTION

-if [ -n "$DOCKER_REGISTRY" ]; then

+if [ -n "$DOCKER_REGISTRY" ] || [ -s "/.dockercfg" ]; then

   docker push $TAG

 fi

@@ -44,5 +44,6 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegis

 	}

 	setupDockerSocket(pod)

+	setupDockerConfig(pod)

 	return pod, nil

 }

@@ -66,6 +66,7 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegistry

 	}

 	setupDockerSocket(pod)

+	setupDockerConfig(pod)

 	return pod, nil

 }

@@ -1,6 +1,9 @@

 package strategy

 import (

+	"os"

+	"path"

+

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 )

@@ -26,3 +29,27 @@ func setupDockerSocket(podSpec *api.Pod) {

 		append(podSpec.DesiredState.Manifest.Containers[0].VolumeMounts,

 			dockerSocketVolumeMount)

 }

+

+// setupDockerConfig configures the path to .dockercfg which contains registry credentials

+func setupDockerConfig(podSpec *api.Pod) {

+	dockerConfigVolume := api.Volume{

+		Name: "docker-cfg",

+		Source: &api.VolumeSource{

+			HostDirectory: &api.HostDirectory{

+				Path: path.Join(os.Getenv("HOME"), ".dockercfg"),

+			},

+		},

+	}

+

+	dockerConfigVolumeMount := api.VolumeMount{

+		Name:      "docker-cfg",

+		ReadOnly:  true,

+		MountPath: "/.dockercfg",

+	}

+

+	podSpec.DesiredState.Manifest.Volumes = append(podSpec.DesiredState.Manifest.Volumes,

+		dockerConfigVolume)

+	podSpec.DesiredState.Manifest.Containers[0].VolumeMounts =

+		append(podSpec.DesiredState.Manifest.Containers[0].VolumeMounts,

+			dockerConfigVolumeMount)

+}