openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From houshen...@apache.org
Subject [incubator-openwhisk-devtools] branch master updated: update to use php72 (#175)
Date Mon, 05 Nov 2018 18:46:07 GMT
This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new c61f78e  update to use php72 (#175)
c61f78e is described below

commit c61f78e3314887422588457ecab09bce5501f721
Author: Carlos Santana <csantanapr@apache.org>
AuthorDate: Mon Nov 5 13:46:03 2018 -0500

    update to use php72 (#175)
    
    remove option for sentinel in runtime manifest
    fix variable for Runc
---
 docker-compose/Makefile                    | 2 +-
 docker-compose/docker-whisk-controller.env | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 9e14d15..c4454dc 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -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
diff --git a/docker-compose/docker-whisk-controller.env b/docker-compose/docker-whisk-controller.env
index 88d34a7..830f2e5 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -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":"openwh
[...]
+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":"openwh
[...]


Mime
View raw message