You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mh...@apache.org on 2020/09/28 12:11:03 UTC
[openwhisk-runtime-python] branch master updated: Update to
golang:1.15 and buster. (#90)
This is an automated email from the ASF dual-hosted git repository.
mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-python.git
The following commit(s) were added to refs/heads/master by this push:
new 8874202 Update to golang:1.15 and buster. (#90)
8874202 is described below
commit 887420224920bb86150c9490cee1db3880e13460
Author: falkzoll <fa...@de.ibm.com>
AuthorDate: Mon Sep 28 14:10:58 2020 +0200
Update to golang:1.15 and buster. (#90)
- Update to golang:1.15 to continue to get security fixes.
- Update from debian stretch to buster stay at latest stable to continue to get security fixes.
- Fix testcase in PythonActionLoopExtraTests.scala due to changed wording in the go runtime (https://github.com/apache/openwhisk-runtime-go/pull/131).
---
core/python2ActionLoop/Dockerfile | 4 ++--
core/python3ActionLoop/Dockerfile | 6 +++---
core/python3AiActionLoop/Dockerfile | 4 ++--
.../scala/runtime/actionContainers/PythonActionLoopExtraTests.scala | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/python2ActionLoop/Dockerfile b/core/python2ActionLoop/Dockerfile
index 5d0d603..1624c5d 100644
--- a/core/python2ActionLoop/Dockerfile
+++ b/core/python2ActionLoop/Dockerfile
@@ -16,7 +16,7 @@
#
# build go proxy from source
-FROM golang:1.12 AS builder_source
+FROM golang:1.15 AS builder_source
ARG GO_PROXY_GITHUB_USER=apache
ARG GO_PROXY_GITHUB_BRANCH=master
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,7 +25,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
mv proxy /bin/proxy
# or build it from a release
-FROM golang:1.12 AS builder_release
+FROM golang:1.15 AS builder_release
ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
diff --git a/core/python3ActionLoop/Dockerfile b/core/python3ActionLoop/Dockerfile
index 4be89e4..0ce04cd 100644
--- a/core/python3ActionLoop/Dockerfile
+++ b/core/python3ActionLoop/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
# build go proxy from source
-FROM golang:1.12 AS builder_source
+FROM golang:1.15 AS builder_source
ARG GO_PROXY_GITHUB_USER=apache
ARG GO_PROXY_GITHUB_BRANCH=master
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -24,7 +24,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
mv proxy /bin/proxy
# or build it from a release
-FROM golang:1.12 AS builder_release
+FROM golang:1.15 AS builder_release
ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
@@ -32,7 +32,7 @@ RUN curl -sL \
&& cd openwhisk-runtime-go-*/main\
&& GO111MODULE=on go build -o /bin/proxy
-FROM python:3.7-stretch
+FROM python:3.7-buster
ARG GO_PROXY_BUILD_FROM=source
# Install common modules for python
diff --git a/core/python3AiActionLoop/Dockerfile b/core/python3AiActionLoop/Dockerfile
index 97a7cd9..54c6038 100644
--- a/core/python3AiActionLoop/Dockerfile
+++ b/core/python3AiActionLoop/Dockerfile
@@ -16,7 +16,7 @@
#
# build go proxy from source
-FROM golang:1.12 AS builder_source
+FROM golang:1.15 AS builder_source
ARG GO_PROXY_GITHUB_USER=apache
ARG GO_PROXY_GITHUB_BRANCH=master
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,7 +25,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
mv proxy /bin/proxy
# or build it from a release
-FROM golang:1.12 AS builder_release
+FROM golang:1.15 AS builder_release
ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/${GO_PROXY_RELEASE_VERSION}.tar.gz\
diff --git a/tests/src/test/scala/runtime/actionContainers/PythonActionLoopExtraTests.scala b/tests/src/test/scala/runtime/actionContainers/PythonActionLoopExtraTests.scala
index 04a8784..93a98ed 100644
--- a/tests/src/test/scala/runtime/actionContainers/PythonActionLoopExtraTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/PythonActionLoopExtraTests.scala
@@ -64,7 +64,7 @@ trait PythonActionLoopExtraTests {
checkStreams(out, err, {
case (o, e) =>
o shouldBe empty
- e should include("command exited before ack")
+ e should include("Command exited abruptly during initialization.")
})
}