docker-compose: Add start cmd for controller (#43)
* [docker-compose] updated build status badge from the incubator repo
* docker-compose: added controller start cmd
* travis build debugging
* travis build debugging
* updated to docker-compomse 1.13
diff --git a/.travis.yml b/.travis.yml
index 4b3fe9a..7be0f7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
env:
global:
- - DOCKER_COMPOSE_VERSION: 1.8.1
+ - DOCKER_COMPOSE_VERSION: 1.13
matrix:
- TOOL: docker-compose
diff --git a/docker-compose/.travis/setup.sh b/docker-compose/.travis/setup.sh
index 12746a8..57fcbb2 100755
--- a/docker-compose/.travis/setup.sh
+++ b/docker-compose/.travis/setup.sh
@@ -7,8 +7,8 @@
then
echo "Installing Docker Compose ${DOCKER_COMPOSE_VERSION}"
sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
+ curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose.bin
+ chmod +x docker-compose.bin
+ sudo mv docker-compose.bin /usr/local/bin/docker-compose
fi
echo "Docker Compose Version:" `docker-compose --version`
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 8b4deba..53f44b8 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -52,6 +52,7 @@
# WHISK CONTROLLER
controller:
image: openwhisk/controller:latest
+ command: /bin/sh -c "controller/bin/controller 0 >> /logs/controller-local_logs.log 2>&1"
links:
- consul:consul.docker
- db:db.docker
diff --git a/docker-compose/docker-whisk-controller.env b/docker-compose/docker-whisk-controller.env
index 5941f7c..479de25 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -28,6 +28,9 @@
LIMITS_ACTIONS_INVOKES_CONCURRENTINSYSTEM=5000
LOADBALANCER_ACTIVATIONCOUNTBEFORENEXTINVOKER=10
+LOADBALANCER_INVOKERBUSYTHRESHOLD=16
+INVOKER_INSTANCES=1
+CONTROLLER_INSTANCES=1
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}]}}
