summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-01-13 08:11:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-13 08:11:07 +0000
commitad86868d3740c6ec4a7da0a7a6126fc0385d6d1b (patch)
tree1b67ee7a5f880c4859c36751974dda2e83f841b1
parent3406cc8184cb20c11971797ce99838f153d27804 (diff)
parentc3ef8b157647cc863417da5dbca8e1c3cbac070a (diff)
Merge "Build kubectl and ginkgo binaries"
-rw-r--r--docker/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 004409ff..4b9ddd4e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,5 +6,7 @@ RUN apk --no-cache add --update make bash go \
grep rsync linux-headers musl-dev findutils && \
git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \
(cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \
- (cd /src/k8s.io/kubernetes && make WHAT=test/e2e/e2e.test) && \
+ (cd /src/k8s.io/kubernetes && \
+ make kubectl ginkgo && \
+ make WHAT=test/e2e/e2e.test) && \
rm -rf /src/k8s.io/kubernetes/.git