Skip to content

Commit 8874202

Browse files
authored
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 (apache/openwhisk-runtime-go#131).
1 parent 8a610a3 commit 8874202

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

core/python2ActionLoop/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# build go proxy from source
19-
FROM golang:1.12 AS builder_source
19+
FROM golang:1.15 AS builder_source
2020
ARG GO_PROXY_GITHUB_USER=apache
2121
ARG GO_PROXY_GITHUB_BRANCH=master
2222
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,7 +25,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
2525
mv proxy /bin/proxy
2626

2727
# or build it from a release
28-
FROM golang:1.12 AS builder_release
28+
FROM golang:1.15 AS builder_release
2929
3030
RUN curl -sL \
3131
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\

core/python3ActionLoop/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717
# build go proxy from source
18-
FROM golang:1.12 AS builder_source
18+
FROM golang:1.15 AS builder_source
1919
ARG GO_PROXY_GITHUB_USER=apache
2020
ARG GO_PROXY_GITHUB_BRANCH=master
2121
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -24,15 +24,15 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
2424
mv proxy /bin/proxy
2525

2626
# or build it from a release
27-
FROM golang:1.12 AS builder_release
27+
FROM golang:1.15 AS builder_release
2828
2929
RUN curl -sL \
3030
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
3131
| tar xzf -\
3232
&& cd openwhisk-runtime-go-*/main\
3333
&& GO111MODULE=on go build -o /bin/proxy
3434

35-
FROM python:3.7-stretch
35+
FROM python:3.7-buster
3636
ARG GO_PROXY_BUILD_FROM=source
3737

3838
# Install common modules for python

core/python3AiActionLoop/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# build go proxy from source
19-
FROM golang:1.12 AS builder_source
19+
FROM golang:1.15 AS builder_source
2020
ARG GO_PROXY_GITHUB_USER=apache
2121
ARG GO_PROXY_GITHUB_BRANCH=master
2222
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,7 +25,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
2525
mv proxy /bin/proxy
2626

2727
# or build it from a release
28-
FROM golang:1.12 AS builder_release
28+
FROM golang:1.15 AS builder_release
2929
3030
RUN curl -sL \
3131
https://github.com/apache/openwhisk-runtime-go/archive/${GO_PROXY_RELEASE_VERSION}.tar.gz\

tests/src/test/scala/runtime/actionContainers/PythonActionLoopExtraTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ trait PythonActionLoopExtraTests {
6464
checkStreams(out, err, {
6565
case (o, e) =>
6666
o shouldBe empty
67-
e should include("command exited before ack")
67+
e should include("Command exited abruptly during initialization.")
6868
})
6969
}
7070

0 commit comments

Comments
 (0)