[incubator-openwhisk-devtools] branch master updated: Add variable to configure the controller and invoker image prefix (#69)

[dragos]

This is an automated email from the ASF dual-hosted git repository.

dragos pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 0089032  Add variable to configure the controller and invoker image 
prefix (#69)
0089032 is described below

commit 0089032c3a03ce0b01deca0ef56875629772c15e
Author: Chetan Mehrotra <chet...@apache.org>
AuthorDate: Wed Dec 6 03:20:50 2017 +0530

    Add variable to configure the controller and invoker image prefix (#69)
---
 docker-compose/README.md          | 6 ++++++
 docker-compose/docker-compose.yml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose/README.md b/docker-compose/README.md
index 4195343..42f68c2 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -144,3 +144,9 @@ To start `docker-compose` with custom images used for 
running actions use the fo
 - `DOCKER_IMAGE_PREFIX` - specify a custom image prefix. I.e. 
```DOCKER_IMAGE_PREFIX=my-prefix make quick-start```
 
 These 2 variable allow you to execute a JS action using the container 
`registry.example.com/my-prefix/nodejs6action`.
+
+## Local Docker containers for controllers and invokers
+
+By default this setup uses published images for controller and invokers from 
`openwhisk` namespace i.e. 
+`openwhisk/controller` and `openwhisk/invoker`. To make use of locally build 
images you can use `DOCKER_OW_IMAGE_PREFIX`
+variable i.e. `DOCKER_OW_IMAGE_PREFIX=whisk make quick-start`
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml 
b/docker-compose/docker-compose.yml
index 28249de..d268d3d 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -37,7 +37,7 @@ services:
 
   # WHISK CONTROLLER
   controller:
-    image: openwhisk/controller
+    image: ${DOCKER_OW_IMAGE_PREFIX:-openwhisk}/controller
     command: /bin/sh -c "controller/bin/controller 0 >> 
/logs/controller-local_logs.log 2>&1"
     links:
       - db:db.docker
@@ -76,7 +76,7 @@ services:
 
   # WHISK INVOKER AGENT
   invoker:
-    image: openwhisk/invoker
+    image: ${DOCKER_OW_IMAGE_PREFIX:-openwhisk}/invoker
     command: /bin/sh -c "/invoker/bin/invoker 0 >> 
/logs/invoker-local_logs.log 2>&1"
     privileged: true
     pid: "host"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].