[GitHub] ddragosd closed pull request #69: Add variable to configure the controller and invoker image prefix

[GitBox <gi...@apache.org>]

ddragosd closed pull request #69: Add variable to configure the controller and invoker image prefix
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/69
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services