You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dr...@apache.org on 2018/08/14 23:39:34 UTC
[incubator-openwhisk-devtools] branch master updated: add support
for Ruby 2.5 (#150)
This is an automated email from the ASF dual-hosted git repository.
dragos 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 20d1a06 add support for Ruby 2.5 (#150)
20d1a06 is described below
commit 20d1a06d10bbe44bc10c3bd1fd97535048434841
Author: Justin Halsall <Ju...@users.noreply.github.com>
AuthorDate: Tue Aug 14 19:39:32 2018 -0400
add support for Ruby 2.5 (#150)
---
docker-compose/Makefile | 5 +++--
docker-compose/docker-whisk-controller.env | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 3ec770b..ac4807d 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -80,7 +80,7 @@ quick-start-info:
docker_build:
echo "building the openwhisk core docker images ... "
cd $(OPENWHISK_PROJECT_HOME) && \
- ./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
+ ./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
docker_pull:
echo "pulling the docker images short list... "
@@ -101,6 +101,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.1
+ docker pull $(DOCKER_IMAGE_PREFIX)/action-ruby-v2.5
docker pull $(DOCKER_IMAGE_PREFIX)/dockerskeleton
download-cli:
@@ -192,7 +193,7 @@ setup:
mkdir -p ~/tmp/openwhisk/api-gateway-ssl
cp $(OPENWHISK_PROJECT_HOME)/ansible/roles/nginx/files/*.pem ~/tmp/openwhisk/api-gateway-ssl
-.PHONY: gw
+.PHONY: gw
gw:
$(shell cat ~/tmp/openwhisk/local.env) docker-compose --project-name openwhisk up apigateway
diff --git a/docker-compose/docker-whisk-controller.env b/docker-compose/docker-whisk-controller.env
index 7f95900..aef8029 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -62,4 +62,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 [...]