commit 3f130aca71b09427d422d87e9f7360ba0b6350fd
author Jim Crossley <jim@crossleys.org> Mon Apr 02 12:47:16 2018 -0400
committer Jim Crossley <jim@crossleys.org> Mon Apr 02 12:47:16 2018 -0400
tree 1bb2f3cac81f0700ee017565a8d538a068b23cb1
parent da00e0c9e32e442c0cc5373c76e6bd53ddd8c825

Picking up labeling changes OCF-90, OCF-92

Also reverting back to pre-marek docker images until we figure out
nginx and couchdb issues.

And moved nginx error_log to /logs

persistent-template.yml

diff --git a/persistent-template.yml b/persistent-template.yml
index bdf3ddd..2035f1c 100644
--- a/persistent-template.yml
+++ b/persistent-template.yml
@@ -148,11 +148,11 @@
   required: true
 - name: OPENWHISK_VERSION
   description: The DockerHub tag for openwhisk/{controller,invoker}
-  value: "rhdemo-7643de9"
+  value: "rhdemo-b7724ef"
   required: true
 - name: PROJECTODD_VERSION
   description: The DockerHub tag for projectodd images
-  value: "1d612c2"
+  value: "cc60dfe"
   required: true
 
 objects:
@@ -536,7 +536,7 @@
       spec:
         containers:
         - name: catalog
-          image: projectodd/whisk_catalog:${PROJECTODD_VERSION}
+          image: projectodd/whisk_catalog:da00e0c
           env:
             - name: "WHISK_AUTH"
               valueFrom:
@@ -1010,6 +1010,7 @@
               '$request $status $body_bytes_sent '
               '$http_referer $http_user_agent $upstream_addr';
           access_log /logs/nginx_access.log combined-upstream;
+          error_log /logs/nginx_error.log;
 
           proxy_http_version 1.1;
           proxy_set_header Connection "";

template.yml

diff --git a/template.yml b/template.yml
index 39f10e7..8c395ef 100644
--- a/template.yml
+++ b/template.yml
@@ -133,11 +133,11 @@
   required: true
 - name: OPENWHISK_VERSION
   description: The DockerHub tag for openwhisk/{controller,invoker}
-  value: "rhdemo-7643de9"
+  value: "rhdemo-b7724ef"
   required: true
 - name: PROJECTODD_VERSION
   description: The DockerHub tag for projectodd images
-  value: "1d612c2"
+  value: "cc60dfe"
   required: true
 
 objects:
@@ -521,7 +521,7 @@
       spec:
         containers:
         - name: catalog
-          image: projectodd/whisk_catalog:${PROJECTODD_VERSION}
+          image: projectodd/whisk_catalog:da00e0c
           env:
             - name: "WHISK_AUTH"
               valueFrom:
@@ -990,6 +990,7 @@
               '$request $status $body_bytes_sent '
               '$http_referer $http_user_agent $upstream_addr';
           access_log /logs/nginx_access.log combined-upstream;
+          error_log /logs/nginx_error.log;
 
           proxy_http_version 1.1;
           proxy_set_header Connection "";