Merge pull request #345 from rjew/update-blog-bingo

Updated blog and bingo examples to use image run-time dependencies

Author: rjew

examples/bingo/README.md

@@ -53,22 +53,18 @@ Let's just add `message.channels` by clicking `Add Workspace Event` button under
 
 ## Create Dispatch Objects
 
-Here are all the source files we need: [bingo.js](bingo.js), [base-image/Dockerfile](base-image/Dockerfile). 
+Here are all the source files we need: [bingo.js](bingo.js), [package.json](package.json). 
 One more thing: you need a working Dispatch installation and `dispatch` CLI on your computer (all right, that's two things). 
 
 
 ### Image
 
-Every Dispatch function needs an image. As of right now, it's the same as base-image. Base images are intended to be basic runtimes for functions - without any additional libraries. Images are to contain the libraries. But for now let's just create a base image with everything we need.
+Every Dispatch function needs an image. Base images are intended to be basic runtimes for functions - without any additional libraries. Images are to contain the libraries.
 
 ```bash
-## Build the image first
-docker build -t ${docker_user}/dispatch-nodejs6-bingo-deps:0.0.1-dev1 ./base-image
-docker push ${docker_user}/dispatch-nodejs6-bingo-deps:0.0.1-dev1
-
 ## Register the image in Dispatch
-dispatch create base-image bingo-deps-base ${docker_user}/dispatch-nodejs6-bingo-deps:0.0.1-dev1 --language=nodejs6
-dispatch create image bingo-deps bingo-deps-base
+dispatch create base-image bingo-base vmware/dispatch-nodejs6-base:0.0.1-dev1 --language=nodejs6
+dispatch create image bingo-deps bingo-base --runtime-deps package.json
 ```
 
 ### Secret

examples/bingo/base-image/Dockerfile

@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+      "request": "2.83.0"
+    }
+}

examples/bingo/package.json

@@ -49,56 +49,16 @@ $ echo $(kubectl get secret minio-minio-user -n minio -o json | jq -r .data.acce
 blogaccess
 ```
 
-## Build the image
-
-This step is optional, as an alternative, a pre-built image may be used:
-```
-$ export BASE_IMAGE=berndtj/dispatch-nodejs6-blog-webapp:0.0.1-dev1
-```
-
-To build the image yourself, continue.
-
-If a docker registry is installed on your cluster (default), you may use that:
-
-1. Point to the docker client running in minikube
-    ```
-    $ eval $(minikube docker-env)
-    ```
-2. Get the Cluster IP of the registry service:
-    ```
-    $ LOCAL_REG=$(kubectl -n dispatch get service docker-registry-docker-registry -o json | jq -r .spec.clusterIP):5000
-    $ echo $LOCAL_REG
-    10.97.167.150:5000
-    ```
-3. Build the image (assuming you've cloned the dispatch repository and your current working directory is dispatch project root):
-    ```
-    export BASE_IMAGE=$LOCAL_REG/dispatch-nodejs6-blog-webapp:0.0.1-dev1
-    docker build -t $BASE_IMAGE ./examples/blog/base-image
-    docker push $BASE_IMAGE
-    ```
-
-Alternatively, you may also use a hosted docker registry (docker hub):
-
-1. Login to docker hub (account required):
-    ```
-    $ docker login
-    Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.
-    Username (berndtj):
-    Password:
-    Login Succeeded
-    ```
-2. Build the image:
-    ```
-    $ export BASE_IMAGE=<docker username>/dispatch-nodejs6-blog-webapp:0.0.1-dev1
-    $ docker build -t $BASE_IMAGE ./examples/blog/base-image
-    $ docker push $BASE_IMAGE
-    ```
-
 ## Register the image with Dispatch
 
+If you haven't cloned the dispatch repository, now is the time:
+```
+$ git clone https://github.com/vmware/dispatch.git && cd dispatch
+```
+
 ```
-$ dispatch create base-image blog-webapp-base-image $BASE_IMAGE --language=nodejs6
-$ dispatch create image blog-webapp-image blog-webapp-base-image
+$ dispatch create base-image blog-webapp-base-image vmware/dispatch-nodejs6-base:0.0.1-dev1 --language=nodejs6
+$ dispatch create image blog-webapp-image blog-webapp-base-image --runtime-deps examples/blog/package.json
 ```
 
 Wait for both the base-image and image to be in the ``READY`` state:
@@ -153,11 +113,6 @@ Note: secret values are hidden, please use --all flag to get them
 
 ## Upload the post.js as a Dispatch function
 
-If you haven't cloned the dispatch repository, now is the time:
-```
-$ git clone https://github.com/vmware/dispatch.git && cd dispatch
-```
-
 Create a dispatch function and associate it with your just created dispatch secret.
 
 ```
@@ -270,7 +225,7 @@ $ echo $DISPATCH_API_URL
 
 Add a new blog post
 ```
-$ curl -s -k -X POST ${DISPATCH_API_URL}/post/add -d '{
+$ curl -s -k -X POST ${DISPATCH_API_URL}/post/add -H "Content-Type: application/json" -d '{
     "op": "add",
     "post":{
         "id": "1234",
@@ -326,7 +281,7 @@ $ curl -s -k -X GET ${DISPATCH_API_URL}/post/list?op=list | jq
 
 Update a blog post
 ```
-$ curl -s -k -X PATCH ${DISPATCH_API_URL}/post/update -d '{
+$ curl -s -k -X PATCH ${DISPATCH_API_URL}/post/update -H "Content-Type: application/json" -d '{
     "op": "update",
     "post":{
         "id": "1234",
@@ -347,7 +302,7 @@ $ curl -s -k -X PATCH ${DISPATCH_API_URL}/post/update -d '{
 
 Delete a blog post
 ```
-$ curl -s -k -X DELETE ${DISPATCH_API_URL}/post/delete -d '{
+$ curl -s -k -X DELETE ${DISPATCH_API_URL}/post/delete -H "Content-Type: application/json" -d '{
     "op": "delete",
     "post": { "id": "1234"}
 }' | jq

examples/blog/README.md

@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+      "minio": "3.2.3"
+    }
+}