Skip to content

standardize actionloop Dockerfile build steps #81

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
rabbah merged 1 commit into from
Jan 26, 2020
Merged

standardize actionloop Dockerfile build steps #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions core/pythonActionLoop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM golang:1.12 as builder

# 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
#ENV PROXY_SOURCE=https://github.com/apache/openwhisk-runtime-go/archive/golang1.11@1.13.0-incubating.tar.gz
#RUN curl -L "$PROXY_SOURCE" | tar xzf - \
# && mkdir -p src/github.com/apache \
# && mv openwhisk-runtime-go-golang1.11-1.13.0-incubating \
# src/github.com/apache/incubator-openwhisk-runtime-go \
# && cd src/github.com/apache/incubator-openwhisk-runtime-go/main \
# && CGO_ENABLED=0 go build -o /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\
| tar xzf -\
&& cd openwhisk-runtime-go-*/main\
&& GO111MODULE=on go build -o /bin/proxy

FROM python:3.7-stretch

# select the builder to use
ARG GO_PROXY_BUILD_FROM=release

# Install common modules for python
RUN pip install \
beautifulsoup4==4.6.3 \
Expand All @@ -41,7 +48,9 @@ RUN pip install \

RUN mkdir -p /action
WORKDIR /
COPY --from=builder /bin/proxy /bin/proxy
COPY --from=builder_source /bin/proxy /bin/proxy_source
COPY --from=builder_release /bin/proxy /bin/proxy_release
RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
ADD pythonbuild.py /bin/compile
ADD pythonbuild.py.launcher.py /bin/compile.launcher.py
ENV OW_COMPILER=/bin/compile
Expand Down
2 changes: 1 addition & 1 deletion gradle/docker.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if(project.hasProperty('dockerHost')) {
}

if(project.hasProperty('dockerBuildArgs')) {
dockerBuildArgs.each { arg ->
dockerBuildArgs.split(' ').each { arg ->
dockerBuildArg += ['--build-arg', arg]
}
}
Expand Down