This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-ruby.git
The following commit(s) were added to refs/heads/master by this push:
new a036dcb Fixes to v2.5 and v2.6 to get things working again (#43)
a036dcb is described below
commit a036dcb5eabc38d2afb6edb0b2bef55a182af952
Author: David Grove <[email protected]>
AuthorDate: Thu Feb 6 15:31:25 2020 -0500
Fixes to v2.5 and v2.6 to get things working again (#43)
* pin rack version to 2.0.x
* switch from alpine to debian based images for ruby-2.6-actionloop
The actionloop goproxy executable fails to run in the ruby-2.6-alpine
image, but works just fine in the debian based ruby-2.6 image.
Since action-ruby-v2.5 is based on ruby-2.5 (and not ruby-2.5-alpine)
it seems better to use the larger image anyways, so not worth
debugging why the actionloop proxy isn't running on alpine.
---
core/ruby2.5Action/Dockerfile | 2 +-
core/ruby2.5Action/Gemfile | 2 +-
core/ruby2.6ActionLoop/Dockerfile | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/ruby2.5Action/Dockerfile b/core/ruby2.5Action/Dockerfile
index c253b23..992adc7 100644
--- a/core/ruby2.5Action/Dockerfile
+++ b/core/ruby2.5Action/Dockerfile
@@ -20,7 +20,7 @@ FROM ruby:2.5
RUN gem install \
bundler \
rubyzip \
- rack \
+ rack:'~>2.0.0' \
puma \
rake `#optional` \
mechanize `#optional` \
diff --git a/core/ruby2.5Action/Gemfile b/core/ruby2.5Action/Gemfile
index 7bd43ed..ae0a745 100644
--- a/core/ruby2.5Action/Gemfile
+++ b/core/ruby2.5Action/Gemfile
@@ -1,4 +1,4 @@
source 'https://rubygems.org'
-gem 'rack'
+gem 'rack' ~> 2.0.0
gem 'rubyzip'
diff --git a/core/ruby2.6ActionLoop/Dockerfile
b/core/ruby2.6ActionLoop/Dockerfile
index 812d7d1..9744787 100644
--- a/core/ruby2.6ActionLoop/Dockerfile
+++ b/core/ruby2.6ActionLoop/Dockerfile
@@ -28,7 +28,7 @@ RUN curl -sL \
&& cd openwhisk-runtime-go-*/main\
&& GO111MODULE=on go build -o /bin/proxy
-FROM ruby:2.6.2-alpine3.9
+FROM ruby:2.6
# select the builder to use
ARG GO_PROXY_BUILD_FROM=release
@@ -40,6 +40,5 @@ COPY --from=builder_release /bin/proxy /bin/proxy_release
RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
ADD lib/launcher.rb /proxy/lib/launcher.rb
ADD bin/compile /proxy/bin/compile
-RUN apk update && apk add python3
ENV OW_COMPILER=/proxy/bin/compile
ENTRYPOINT ["/bin/proxy"]
