This is an automated email from the ASF dual-hosted git repository. markusthoemmes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push: new c1a00ab Revert "Mitigate missing docker 1.12 binary download. (#3758)" as the cli is downloadbale again. (#3761) c1a00ab is described below commit c1a00ab27e31637bdb5519fe5f7a5d2dbd7c6c23 Author: Christian Bickel <git...@cbickel.de> AuthorDate: Wed Jun 13 18:04:10 2018 +0200 Revert "Mitigate missing docker 1.12 binary download. (#3758)" as the cli is downloadbale again. (#3761) This reverts commit 008996d099a730a2179ead97504ab631d30f1a80. --- core/invoker/Dockerfile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile index ea5267a..d1c5d8c 100644 --- a/core/invoker/Dockerfile +++ b/core/invoker/Dockerfile @@ -1,7 +1,26 @@ # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements; and to You under the Apache License, Version 2.0. -FROM openwhisk/invoker +FROM scala + +ENV DOCKER_VERSION 1.12.0 +ENV KUBERNETES_VERSION 1.6.4 + +RUN apk add --update openssl + +# Uncomment to fetch latest version of docker instead: RUN wget -qO- https://get.docker.com | sh +# Install docker client +RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \ +tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \ +tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \ +rm -f docker-${DOCKER_VERSION}.tgz && \ +chmod +x /usr/bin/docker && \ +chmod +x /usr/bin/docker-runc + +# Install kubernetes client +RUN wget --no-verbose https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl && \ +chmod +x kubectl && \ +mv kubectl /usr/bin/kubectl ADD build/distributions/invoker.tar ./ -- To stop receiving notification emails like this one, please contact markusthoem...@apache.org.