Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Ruby 2.5 #150

Merged
merged 1 commit into from
Aug 14, 2018
Merged

Add support for Ruby 2.5 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker-compose/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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... "
Expand All @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-whisk-controller.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":"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"}}]},"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"},"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"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"latest"}]}