Skip to content
Snippets Groups Projects
Unverified Commit 55b7c105 authored by Michele Sciabarra's avatar Michele Sciabarra Committed by GitHub
Browse files

use apache sources (#86)

* use runtime from apache sources

* built also actionloop for pyhton3.7 ai
parent 90a8e853
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 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\
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
......
......@@ -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) {
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment