summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-01-13 08:08:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-13 08:08:59 +0000
commit3406cc8184cb20c11971797ce99838f153d27804 (patch)
treeb1645b1b7e62dfdee9841b5746dfa575f9e3c0da
parent93d35d9b5dfee6a5d9708400120a6a5ad9d83b78 (diff)
parent7dd4fc8e19c075bd7d50a16e4cd4b4530009ae2c (diff)
Merge "Build K8s via specific tags/branches"
-rw-r--r--docker/Dockerfile7
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ff66adda..004409ff 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,10 @@
FROM opnfv/functest-core
+ARG K8S_TAG=v1.7.3
+
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 && \
- make WHAT=test/e2e/e2e.test
+ (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \
+ (cd /src/k8s.io/kubernetes && make WHAT=test/e2e/e2e.test) && \
+ rm -rf /src/k8s.io/kubernetes/.git