Making yaml files templates, updating readme and makefile.

Author: Jon Wayne Parrott

optional-container-engine/.gitignore

@@ -0,0 +1,2 @@
+bookshelf-frontend.yaml
+bookshelf-worker.yaml

optional-container-engine/Makefile

@@ -1,3 +1,5 @@
+GCLOUD_PROJECT:=$(shell gcloud config list project --format="value(core.project)")
+
 .PHONY: all
 all: deploy
 
@@ -21,8 +23,8 @@ push: build
 
 .PHONY: template
 template:
-	sed -i ".tmpl" "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-frontend.yaml
-	sed -i ".tmpl" "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-worker.yaml
+	sed "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-frontend.tmpl.yaml > bookshelf-frontend.yaml
+	sed "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-worker.tmpl.yaml > bookshelf-worker.yaml
 
 .PHONY: deploy-frontend
 deploy-frontend: push template

optional-container-engine/README.md

@@ -50,7 +50,7 @@ Before the application can be deployed to Container Engine, you will need build
 
 The bookshelf app has two distinct "tiers". The frontend serves a web interface to create and manage books, while the worker handles fetching book information from the Google Books API.
 
-`bookshelf-frontend.yaml` contains the Kubernetes resource definitions to deploy the frontend. **Update this file with your Project ID**, then use `kubectl` to create these resources on the cluster:
+Copy `bookshelf-frontend.tmpl.yaml` to `bookshelf-frontend.yaml` and **update the file with your Project ID**. This file contains the Kubernetes resource definitions to deploy the frontend. You can use `kubectl` to create these resources on the cluster:
 
     kubectl create -f bookshelf-frontend.yaml
 
@@ -70,7 +70,7 @@ You can then browse to the public IP address in your browser to see the bookshel
 
 # Deploy worker
 
-`bookshelf-worker.yaml` contains the Kubernetes resource definitions to deploy the worker. The worker doesn't need to serve web traffic or expose any ports, so it has significantly less configuration than the frontend. **Update `bookshelf-worker.yaml` file with your Project ID**, then use `kubectl` to create these resources on the cluster:
+Copy `bookshelf-worker.tmpl.yaml` to `bookshelf-worker.yaml` and **update the file with your Project ID**. This file contains the Kubernetes resource definitions to deploy the worker. The worker doesn't need to serve web traffic or expose any ports, so it has significantly less configuration than the frontend. You can use `kubectl` to create these resources on the cluster:
 
     kubectl create -f bookshelf-worker.yaml