update to use php72 (#175)
authorCarlos Santana <csantanapr@apache.org>
Mon, 5 Nov 2018 18:46:03 +0000 (13:46 -0500)
committerVincent <shou@us.ibm.com>
Mon, 5 Nov 2018 18:46:03 +0000 (13:46 -0500)
remove option for sentinel in runtime manifest
fix variable for Runc

docker-compose/Makefile
docker-compose/docker-whisk-controller.env

index 9e14d15..c4454dc 100644 (file)
@@ -127,7 +127,7 @@ docker-pull-full:
        docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v3.1.1
        docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v4.1
        docker pull $(DOCKER_IMAGE_PREFIX)/java8action
-       docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.1
+       docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.2
        docker pull $(DOCKER_IMAGE_PREFIX)/action-ruby-v2.5
        docker pull $(DOCKER_IMAGE_PREFIX)/actionloop-golang-v1.11
        docker pull $(DOCKER_IMAGE_PREFIX)/dockerskeleton
index 88d34a7..830f2e5 100644 (file)
@@ -52,7 +52,7 @@ CONFIG_kamon_statsd_port=8125
 LOADBALANCER_ACTIVATIONCOUNTBEFORENEXTINVOKER=10
 LOADBALANCER_USERMEMORY=1024m
 
-INVOKER_USE_RUNC=False
+CONFIG_whisk_docker_containerFactory_useRunc=False
 INVOKER_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098
 INVOKER_INSTANCES=1
 
@@ -61,4 +61,4 @@ AKKA_CLUSTER_SEED_NODES=[]
 AKKA_CLUSTER_BIND_PORT=5221
 
 WHISK_SYSTEM_KEY=whisk.system
-RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs","image":{"prefix":"openwhisk","name":"nodejsaction","tag":"latest"},"deprecated":true},{"kind":"nodejs:6","default":true,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"latest"},"deprecated":false,"stemCells":[{"count":2,"memory":"256 MB"}]},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"latest"},"deprecated":false}],"python":[{"kind":"python","image":{"prefix":"openwhisk","name":"python2action","tag":"latest"},"deprecated":false},{"kind":"python:2","default":true,"image":{"prefix":"openwhisk","name":"python2action","tag":"latest"},"deprecated":false},{"kind":"python:3","image":{"prefix":"openwhisk","name":"python3action","tag":"latest"},"deprecated":false}],"swift":[{"kind":"swift:3.1.1","image":{"prefix":"openwhisk","name":"action-swift-v3.1.1","tag":"latest"},"deprecated":false},{"kind":"swift:4.1","default":true,"image":{"prefix":"openwhisk","name":"action-swift-v4.1","tag":"latest"},"deprecated":false}],"java":[{"kind":"java","default":true,"image":{"prefix":"openwhisk","name":"java8action","tag":"latest"},"deprecated":false,"attached":{"attachmentName":"jarfile","attachmentType":"application/java-archive"},"sentinelledLogs":false,"requireMain":true}],"php":[{"kind":"php:7.1","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.1","tag":"latest"}}],"ruby":[{"kind":"ruby:2.5","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-ruby-v2.5","tag":"latest"}}],"go":[{"kind":"go:1.11","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"actionloop-golang-v1.11","tag":"latest"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"latest"}]}
+RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs","image":{"prefix":"openwhisk","name":"nodejsaction","tag":"latest"},"deprecated":true},{"kind":"nodejs:6","default":true,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"latest"},"deprecated":false,"stemCells":[{"count":2,"memory":"256 MB"}]},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"latest"},"deprecated":false}],"python":[{"kind":"python","image":{"prefix":"openwhisk","name":"python2action","tag":"latest"},"deprecated":false},{"kind":"python:2","default":true,"image":{"prefix":"openwhisk","name":"python2action","tag":"latest"},"deprecated":false},{"kind":"python:3","image":{"prefix":"openwhisk","name":"python3action","tag":"latest"},"deprecated":false}],"swift":[{"kind":"swift:3.1.1","image":{"prefix":"openwhisk","name":"action-swift-v3.1.1","tag":"latest"},"deprecated":false},{"kind":"swift:4.1","default":true,"image":{"prefix":"openwhisk","name":"action-swift-v4.1","tag":"latest"},"deprecated":false}],"java":[{"kind":"java","default":true,"image":{"prefix":"openwhisk","name":"java8action","tag":"latest"},"deprecated":false,"attached":{"attachmentName":"jarfile","attachmentType":"application/java-archive"},"requireMain":true}],"php":[{"kind":"php:7.2","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.2","tag":"latest"}}],"ruby":[{"kind":"ruby:2.5","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-ruby-v2.5","tag":"latest"}}],"go":[{"kind":"go:1.11","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"actionloop-golang-v1.11","tag":"latest"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"latest"}]}