csantanapr closed pull request #188: Add PHP 7.3 runtime to the docker-compose
manifest
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/188
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/Makefile b/docker-compose/Makefile
index aa97d5b..86ac385 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -124,6 +124,7 @@ docker-pull-full:
docker pull $(DOCKER_IMAGE_PREFIX)/action-swift-v4.1
docker pull $(DOCKER_IMAGE_PREFIX)/java8action
docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.2
+ docker pull $(DOCKER_IMAGE_PREFIX)/action-php-v7.3
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 33625ae..9f271a4 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -61,4 +61,4 @@ AKKA_CLUSTER_SEED_NODES=[]
AKKA_CLUSTER_BIND_PORT=5221
WHISK_SYSTEM_KEY=whisk.system
-RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"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},{"kind":"nodejs:10","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v10","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"}}],"dotnet":[{"kind":"dotnet:2.2","default":true,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v2.2","tag":"latest"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"latest"}]}
+RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"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},{"kind":"nodejs:10","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v10","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":false,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.2","tag":"latest"}},{"kind":"php:7.3","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.3","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"}}],"dotnet":[{"kind":"dotnet:2.2","default":true,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v2.2","tag":"latest"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"latest"}]}
----------------------------------------------------------------
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
