This is an automated email from the ASF dual-hosted git repository.
msciabarra 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 55b7c10 use apache sources (#86)
55b7c10 is described below
commit 55b7c10516d311ef7d93072cc0b01fd83e79c499
Author: Michele Sciabarra <[email protected]>
AuthorDate: Sun Mar 15 15:36:55 2020 +0100
use apache sources (#86)
* use runtime from apache sources
* built also actionloop for pyhton3.7 ai
---
.travis.yml | 2 +-
core/python2ActionLoop/Dockerfile | 7 ++++---
core/python3ActionLoop/Dockerfile | 7 ++++---
core/python3AiActionLoop/Dockerfile | 9 +++++----
tests/build.gradle | 2 ++
tools/travis/publish.sh | 2 ++
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2184acf..217a680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ deploy:
all_branches: true
repo: apache/openwhisk-runtime-python
- provider: script
- script: "./tools/travis/publish.sh openwhisk 3 nightly &&
./tools/travis/publish.sh openwhisk 3-ai nightly && ./tools/travis/publish.sh
openwhisk 3-loop nightly"
+ script: "./tools/travis/publish.sh openwhisk 3 nightly &&
./tools/travis/publish.sh openwhisk 3-ai nightly && ./tools/travis/publish.sh
openwhisk 3-loop nightly && ./tools/travis/publish.sh openwhisk 3-loopai
nightly"
on:
branch: master
repo: apache/openwhisk-runtime-python
diff --git a/core/python2ActionLoop/Dockerfile
b/core/python2ActionLoop/Dockerfile
index 2d3e278..5d0d603 100644
--- a/core/python2ActionLoop/Dockerfile
+++ b/core/python2ActionLoop/Dockerfile
@@ -17,9 +17,10 @@
# build go proxy from source
FROM golang:1.12 AS builder_source
-#RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main &&
mv /go/bin/main /bin/proxy
-RUN git clone --branch dev \
- https://github.com/nimbella-corp/openwhisk-runtime-go /src ;\
+ARG GO_PROXY_GITHUB_USER=apache
+ARG GO_PROXY_GITHUB_BRANCH=master
+RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
+ https://github.com/${GO_PROXY_GITHUB_USER}/openwhisk-runtime-go /src ;\
cd /src ; env GO111MODULE=on CGO_ENABLED=0 go build main/proxy.go && \
mv proxy /bin/proxy
diff --git a/core/python3ActionLoop/Dockerfile
b/core/python3ActionLoop/Dockerfile
index dee8c5f..4be89e4 100644
--- a/core/python3ActionLoop/Dockerfile
+++ b/core/python3ActionLoop/Dockerfile
@@ -16,9 +16,10 @@
#
# build go proxy from source
FROM golang:1.12 AS builder_source
-#RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main &&
mv /go/bin/main /bin/proxy
-RUN git clone --branch dev \
- https://github.com/nimbella-corp/openwhisk-runtime-go /src ;\
+ARG GO_PROXY_GITHUB_USER=apache
+ARG GO_PROXY_GITHUB_BRANCH=master
+RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
+ https://github.com/${GO_PROXY_GITHUB_USER}/openwhisk-runtime-go /src ;\
cd /src ; env GO111MODULE=on CGO_ENABLED=0 go build main/proxy.go && \
mv proxy /bin/proxy
diff --git a/core/python3AiActionLoop/Dockerfile
b/core/python3AiActionLoop/Dockerfile
index 3b422e6..97a7cd9 100644
--- a/core/python3AiActionLoop/Dockerfile
+++ b/core/python3AiActionLoop/Dockerfile
@@ -17,9 +17,10 @@
# build go proxy from source
FROM golang:1.12 AS builder_source
-#RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main &&
mv /go/bin/main /bin/proxy
-RUN git clone --branch dev \
- https://github.com/nimbella-corp/openwhisk-runtime-go /src ;\
+ARG GO_PROXY_GITHUB_USER=apache
+ARG GO_PROXY_GITHUB_BRANCH=master
+RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
+ https://github.com/${GO_PROXY_GITHUB_USER}/openwhisk-runtime-go /src ;\
cd /src ; env GO111MODULE=on CGO_ENABLED=0 go build main/proxy.go && \
mv proxy /bin/proxy
@@ -27,7 +28,7 @@ RUN git clone --branch dev \
FROM golang:1.12 AS builder_release
ARG [email protected]
RUN curl -sL \
-
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
+
https://github.com/apache/openwhisk-runtime-go/archive/${GO_PROXY_RELEASE_VERSION}.tar.gz\
| tar xzf -\
&& cd openwhisk-runtime-go-*/main\
&& GO111MODULE=on go build -o /bin/proxy
diff --git a/tests/build.gradle b/tests/build.gradle
index e720728..01e8bde 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -44,6 +44,8 @@ tasks.withType(ScalaCompile) {
}
task testPython3(type: Test) {
+ // python2 is end-of-life and the runtime not built by default
+ exclude 'scala/runtime/actionContainers/Python2ActionLoopContainerTests'
}
task buildArtifacts(type:Exec) {
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index add19e9..d681957 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -36,6 +36,8 @@ elif [ ${RUNTIME_VERSION} == "3-ai" ]; then
RUNTIME="python3AiAction"
elif [ ${RUNTIME_VERSION} == "3-loop" ]; then
RUNTIME="pythonActionLoop"
+elif [ ${RUNTIME_VERSION} == "3-loopai" ]; then
+ RUNTIME="python3AiActionLoop"
fi
if [[ ! -z ${DOCKER_USER} ]] && [[ ! -z ${DOCKER_PASSWORD} ]]; then
