@@ -8,21 +8,22 @@ To do this, run:

 This will:

-1. Launch the openshift server

+1. Launch the OpenShift server

  * Logs are available in logs/openshift.log

-2. Submit the template/template.json for parameterization

+2. Create a private Docker registry running in OpenShift

-3. Store the resulting config json in processed/template.processed.json

+3. Define a build configuration for the application

-4. Submit the config json to openshift for creation

+4. Trigger a new build of the application

-5. Confirm the application is created/accessible via curl

+5. Submit the template/template.json for parameterization

-6. Trigger a new build of the application

+6. Store the resulting config json in processed/template.processed.json

-7. Show the new docker image created on your local system as a result of the build

- * Normally the next step would be to push this image to a docker registry and then create a new openshift application based on it, or cause the existing application to be redeployed with the new image.  See the next section to exercise this flow.

+7. Submit the config json to OpenShift for creation

+

+8. Confirm the application is created/accessible via curl

 To reset your system after running this example, you can run:

@@ -16,8 +16,23 @@ All commands assume the `openshift` binary is in your path:

 1. Launch `openshift`

-        $ USE_HOST_DOCKER_SOCKET=true openshift start --listenAddr="0.0.0.0:8080"

+        $ DOCKER_REGISTRY=localhost:5000 openshift start --listenAddr="0.0.0.0:8080"

+2. Deploy the private docker registry within OpenShift:

+

+        $ openshift kube apply -c registry_config/registry_config.json

+

+3. Confirm the registry is started:

+

+        $ openshift kube list pods

+        

+    You should see:

+            

+        ID                                                  Image(s)                   Host                Labels                                                      Status

+        ----------                                          ----------                 ----------          ----------                                                  ----------

+        05929ee5-3fb2-11e4-a043-3c970e3bf0b7                registry                   127.0.0.1/          name=frontendPod,replicationController=frontendController   Running

+

+                 

 2. Fork the [ruby sample repository](https://github.com/openshift/ruby-hello-world)

 3. *Optional:* Add the following webhook to your new github repository:

@@ -27,8 +42,6 @@ All commands assume the `openshift` binary is in your path:

 4. Edit buildcfg/buildcfg.json

  * Update the sourceURI to point to your forked repository.

- * Update the imageTag to reflect your Docker username (eg <docker_username>/origin-ruby-sample)

-  * The built image will be tagged with this id and pushed to Docker later.

 5. Create a build configuration for your application.  This configuration is used by OpenShift to rebuild your application's Docker image (eg when you push changes to the application source).

@@ -62,23 +75,19 @@ All commands assume the `openshift` binary is in your path:

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

         20f54507-3dcd-11e4-984b-3c970e3bf0b7   complete            build-docker-20f54507-3dcd-11e4-984b-3c970e3bf0b7

-        

-8. Once the build is complete, push the resulting image to your Docker repository:

-

-        $ docker push <docker_username>/origin-ruby-sample        

-

-9. Modify the application template to reference your Docker image:

- * Change "image": "openshift/origin-ruby-sample", to "image": "<docker_username>/origin-ruby-sample",

- 

-10. Submit the application template for processing:

+     The build will be automatically pushed to the private docker registry running in OpenShift and tagged with the imageTag listed

+     in the buildcfg.json.  Note that the private docker registry is using ephemeral storage, so when it is stopped, the image will

+     be lost.  An external volume can be used for storage, but is beyond the scope of this tutorial.

+     

+9. Submit the application template for processing:

-        $ curl -sld @template/template.json http://localhost:8080/osapi/v1beta1/templateConfigs > processed/template.processed.json

+        $ openshift kube process -c template/template.json > processed/template.processed.json

-11. Create the application using the processed template:

+10. Create the application using the processed template:

         $ openshift kube apply -c processed/template.processed.json

-12. Wait for the application's frontend pod to be started:

+11. Wait for the application's frontend pod to be started:

         $ openshift kube list pods

@@ -88,7 +97,7 @@ All commands assume the `openshift` binary is in your path:

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

         fc66bffd-3dcc-11e4-984b-3c970e3bf0b7                openshift/origin-ruby-sample   127.0.0.1/          name=frontend,replicationController=frontendController   Running

-13. Confirm the application is now accessible via the frontend service on port 5432:

+12. Confirm the application is now accessible via the frontend service on port 5432:

         $ curl localhost:5432

@@ -100,18 +109,18 @@ All commands assume the `openshift` binary is in your path:

         DB password is dQfUlnTG

-14. Make an additional change to your ruby sample app.rb file and push it.

+13. Make an additional change to your ruby sample app.rb file and push it.

  * If you do not have the webhook enabled, you'll have to manually trigger another build:

             $ curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @buildinvoke/pushevent.json http://localhost:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

-15. Repeat steps 7-8

+14. Repeat steps 7-8

-16. Locate the container running the ruby application and kill it:

+15. Locate the container running the ruby application and kill it:

-        $ docker kill `docker ps | grep origin-ruby-sample | awk '{print $1}'`

+        $ docker kill `docker ps | grep /usr/bin/ruby | awk '{print $1}'`

-17. Use 'docker ps' to watch as OpenShift automatically recreates the killed container using the latest version of your image.  Once the container is recreated, curl the application to see the change you made in step 14.

+16. Use 'docker ps' to watch as OpenShift automatically recreates the killed container using the latest version of your image.  Once the container is recreated, curl the application to see the change you made in step 14.

         $ curl localhost:5432

@@ -119,5 +128,5 @@ Congratulations, you've successfully deployed and updated an application on Open

         $ ./cleanup.sh

-    This will stop the `openshift` process, remove the etcd storage, and kill all Docker containers running on your host system.  (**Use with caution!**   Docker containers unrelated to OpenShift will also be killed by this script)

+This will stop the `openshift` process, remove the etcd storage, and kill all Docker containers running on your host system.  (**Use with caution!**   Docker containers unrelated to OpenShift will also be killed by this script)

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,61 @@

+{

+    "apiVersion": "v1beta1",

+    "creationTimestamp": "2014-09-18T18:28:38-04:00",

+    "description": "Creates a private docker registry",

+    "id": "docker-registry-config",

+    "items": [

+        {

+            "apiVersion": "v1beta1",

+            "containerPort": 0,

+            "creationTimestamp": null,

+            "id": "registryservice",

+            "kind": "Service",

+            "port": 5000,

+            "selector": {

+                "name": "registryPod"

+            }

+        },

+        {

+            "apiVersion": "v1beta1",

+            "creationTimestamp": null,

+            "desiredState": {

+                "podTemplate": {

+                    "desiredState": {

+                        "manifest": {

+                            "containers": [

+                                {

+                                    "image": "registry",

+                                    "name": "registry-container",

+                                    "ports": [

+                                        {

+                                            "containerPort": 5000,

+                                            "protocol": "TCP"

+                                        }

+                                    ]

+                                }

+                            ],

+                            "id": "registryPod",

+                            "version": "v1beta1",

+                            "volumes": null

+                        },

+                        "restartpolicy": {}

+                    },

+                    "labels": {

+                        "name": "registryPod"

+                    }

+                },

+                "replicaSelector": {

+                    "name": "registryPod"

+                },

+                "replicas": 1

+            },

+            "id": "registryController",

+            "kind": "ReplicationController",

+            "labels": {

+                "name": "registryController"

+            }

+        }

+    ],

+    "kind": "Config",

+    "name": "docker-registry-config"

+}

@@ -1,47 +1,39 @@

 #!/bin/bash

-# openshift server host

+# OpenShift server host

 OSHOST=localhost

-# openshift binary

+# OpenShift binary

 openshift="../../_output/go/bin/openshift"

-# OPTIONAL: Wipe out previous openshift/k8s deployment information for a 

+# OPTIONAL: Wipe out previous OpenShift/k8s deployment information for a 

 # clean start.

 rm -rf openshift.local.etcd

-# OPTIONAL: kill all docker containers before starting

+# OPTIONAL: kill all Docker containers before starting

 # docker kill `docker ps --no-trunc -q`

-# Start the openshift all-in-one server

+# Start the OpenShift all-in-one server

 # (starts a kubernetes master and minion as well as providing the

 # origin REST api)

-# Uses Host docker socket so that the resulting docker images are 

-# available on the host.  Otherwise the docker image lives only inside

-# the docker build container, and goes away when the build container

-# goes away.  (Currently the resulting image from the build is not

-# pushed to any registry).

+# DOCKER_REGISTRY refers to the private Docker registry running inside a pod in OpenShift.

 echo "Launching openshift all-in-one server"

-USE_HOST_DOCKER_SOCKET=true $openshift start --listenAddr="0.0.0.0:8080" &> logs/openshift.log &

+DOCKER_REGISTRY=localhost:5000 $openshift start --listenAddr="0.0.0.0:8080" &> logs/openshift.log &

 sleep 5

-# Convert template to config

-echo "Submitting template json for processing..."

-curl -sld @template/template.json http://$OSHOST:8080/osapi/v1beta1/templateConfigs > processed/template.processed.json

-

-# Deploy the config

-$openshift kube -h http://$OSHOST:8080 apply -c processed/template.processed.json

+# Deploy the private Docker registry config

+openshift kube apply -c registry_config/registry_config.json

 # Wait for the app container to start up

 rc=1

 while [ ! $rc -eq 0 ]

 do

-  echo "Waiting for frontend pod to start..."

+  echo "Waiting for Docker registry pod to start..."

   $openshift kube list pods

   sleep 5

-  $openshift kube list pods | grep frontend | grep Running

+  $openshift kube list pods | grep registryPod | grep Running

   rc=$?

 done

@@ -49,21 +41,13 @@ $openshift kube list services | grep frontend

 rc=$?

 while [ ! $rc -eq 0 ]

 do

-  echo "Waiting for frontend service to start..."

+  echo "Waiting for Docker registry service to start..."

   $openshift kube list services

   sleep 5

-  $openshift kube list services | grep frontend

+  $openshift kube list services | grep registryPod

   rc=$?

 done

-# Sometimes the app isn't quite available even though the pod is running,

-# wait a little longer.

-sleep 5 

-

-# Confirm the app is running/responsive.

-echo "Frontend is available, sending request.  Frontend says:"

-curl localhost:5432

-

 # show build cfgs

 echo "Initially no build configurations:"

 $openshift kube list buildConfigs

@@ -86,12 +70,6 @@ $openshift kube list builds

 echo "Triggering new build"

 curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @buildinvoke/pushevent.json http://$OSHOST:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

-# webhook url

-#http://$OSHOST:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

-#cd ~/demofiles/app

-#edit app.rb

-#git commit -am . ; git push origin master

-

 #show build running

 echo "Build now running: "

 $openshift kube list builds

@@ -108,6 +86,41 @@ do

   $openshift kube get builds/$id | grep complete

   rc=$?

 done

-  

-echo "Your new application image is origin_ruby_sample: "

-docker images | grep origin-ruby-sample

+

+# Convert template to config

+echo "Submitting application template json for processing..."

+openshift kube process -c template/template.json > processed/template.processed.json

+

+# Deploy the config

+$openshift kube -h http://$OSHOST:8080 apply -c processed/template.processed.json

+

+# Wait for the app container to start up

+rc=1

+while [ ! $rc -eq 0 ]

+do

+  echo "Waiting for frontend pod to start..."

+  $openshift kube list pods

+  sleep 5

+  $openshift kube list pods | grep frontend | grep Running

+  rc=$?

+done

+

+$openshift kube list services | grep frontend

+rc=$?

+while [ ! $rc -eq 0 ]

+do

+  echo "Waiting for frontend service to start..."

+  $openshift kube list services

+  sleep 5

+  $openshift kube list services | grep frontend

+  rc=$?

+done

+

+# Sometimes the app isn't quite available even though the pod is running,

+# wait a little longer.

+sleep 15

+

+# Confirm the app is running/responsive.

+echo "Frontend is available, sending request.  Frontend says:"

+curl localhost:5432

+  

\ No newline at end of file

@@ -47,7 +47,7 @@

               "id": "frontendController",

               "containers": [{

                 "name": "ruby-helloworld",

-                "image": "openshift/origin-ruby-sample",

+                "image": "localhost:5000/openshift/origin-ruby-sample",

                 "env": [

                   {

                     "name": "ADMIN_USERNAME",