You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/02/16 04:45:37 UTC

[GitHub] chetanmeh closed pull request #70: Use init.sh instead of direct command

chetanmeh closed pull request #70: Use init.sh instead of direct command
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/70
 
 
   

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/docker-compose.yml b/docker-compose/docker-compose.yml
index 94c813a..288ce93 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -38,7 +38,7 @@ services:
   # WHISK CONTROLLER
   controller:
     image: ${DOCKER_OW_IMAGE_PREFIX:-openwhisk}/controller
-    command: /bin/sh -c "controller/bin/controller 0 >> /logs/controller-local_logs.log 2>&1"
+    command: /bin/sh -c "./init.sh 0 >> /logs/controller-local_logs.log 2>&1"
     links:
       - db:db.docker
       - kafka:kafka.docker
@@ -77,7 +77,7 @@ services:
   # WHISK INVOKER AGENT
   invoker:
     image: ${DOCKER_OW_IMAGE_PREFIX:-openwhisk}/invoker
-    command: /bin/sh -c "/invoker/bin/invoker 0 >> /logs/invoker-local_logs.log 2>&1"
+    command: /bin/sh -c "/.init.sh 0 >> /logs/invoker-local_logs.log 2>&1"
     privileged: true
     pid: "host"
     userns_mode: "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