Skip to content

use apache sources #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sciabarracom merged 6 commits into from Mar 15, 2020
Merged

use apache sources #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a66b582
use apache sources
sciabarracom Mar 13, 2020
cd123a0
disabling python2-actionloop and python3-ai-actionloop tests as the r…
sciabarracom Mar 13, 2020
20fd3aa
fix variables
sciabarracom Mar 13, 2020
0e02320
forgot nimbella-corp
sciabarracom Mar 13, 2020
27f5868
exluding python2 test and building python3 action loop
sciabarracom Mar 13, 2020
72614ca
typo
sciabarracom Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions core/python2ActionLoop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions core/python3ActionLoop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions core/python3AiActionLoop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@

# 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

# or build it from a release
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
Expand Down
2 changes: 2 additions & 0 deletions tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions tools/travis/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down