csantanapr closed pull request #64: Add ddoc and controller_ha env variables URL: https://github.com/apache/incubator-openwhisk-devtools/pull/64
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-whisk-controller.env b/docker-compose/docker-whisk-controller.env index f94817a..5a9ef71 100644 --- a/docker-compose/docker-whisk-controller.env +++ b/docker-compose/docker-whisk-controller.env @@ -13,6 +13,9 @@ DB_PREFIX=local_ DB_WHISK_ACTIONS=local_whisks DB_WHISK_AUTHS=local_subjects DB_WHISK_ACTIVATIONS=local_activations +DB_WHISK_ACTIONS_DDOC=whisks.v2 +DB_WHISK_ACTIVATIONS_DDOC=whisks.v2 +DB_WHISK_ACTIVATIONS_FILTER_DDOC=whisks-filters.v2 KAFKA_NUMPARTITIONS=1 @@ -32,6 +35,7 @@ WHISK_SYSTEM_KEY=whisk.system RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs","image":{"name":"nodejsaction"},"deprecated":true},{"kind":"nodejs:6","default":true,"image":{"name":"nodejs6action"}}],"python":[{"kind":"python","image":{"name":"python2action"}},{"kind":"python:2","default":true,"image":{"name":"python2action"}},{"kind":"python:3","image":{"name":"python3action"}}],"swift":[{"kind":"swift","image":{"name":"swiftaction"},"deprecated":true},{"kind":"swift:3","default":true,"image":{"name":"swift3action"}}],"java":[{"kind":"java","attached":{"attachmentName":"jarfile","attachmentType":"application/java-archive"},"sentinelledLogs":false,"requireMain":true,"image":{"name":"java8action"},"default":true}]}} CONTROLLER_LOCALBOOKKEEPING=true +CONTROLLER_HA=false AKKA_CLUSTER_HOST=localhost AKKA_CLUSTER_SEED_NODES=[] AKKA_CLUSTER_BIND_PORT=5221 ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services