aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-09-07 21:08:23 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-09-07 21:08:23 +0200
commit29ff0331cae758b0d17e8e92a4518126914a3446 (patch)
tree755e7756e472d011658505b9219f2c61893c468d /docker
parent172e745d831d4730bfb6fb0d8c2df2029a6c75bb (diff)
Fix K8s release in cnf/Dockerfile
Change-Id: I1119bc9981c865d71260f2baa17678905d77255b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/cnf/Dockerfile16
1 files changed, 11 insertions, 5 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 1cd74ab4..260baa69 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,21 +1,27 @@
FROM opnfv/functest-kubernetes-core:hunter
+ARG K8S_TAG=v1.13.12
ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1
RUN apk --no-cache add --update wget curl libc6-compat && \
- K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.19.txt) && \
+ apk --no-cache add --virtual .build-deps --update make rsync findutils && \
case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm64;; x86_64) ARCH=amd64;; esac && \
- curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \
- -s --output /usr/local/bin/kubectl && \
+ git init /src/k8s.io/kubernetes && \
+ (cd /src/k8s.io/kubernetes && \
+ git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \
+ git checkout FETCH_HEAD && \
+ make kubectl && \
+ mv _output/bin/* /usr/local/bin) && \
+ rm -r /src/k8s.io && \
case $(uname -m) in x86_64) \
curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$(echo $CNF_CONFORMANCE_TAG |cut -d\- -f 1)-$ARCH-static \
-Ls --output /usr/local/bin/cnf-conformance && \
chmod +x /usr/local/bin/cnf-conformance ;; esac && \
- chmod +x /usr/local/bin/kubectl && \
mkdir -p /src/cnf-conformance && \
curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/example-cnfs/coredns/cnf-conformance.yml \
-s --output /src/cnf-conformance/cnf-conformance.yml && \
curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.yml \
- -s --output /src/cnf-conformance/points.yml
+ -s --output /src/cnf-conformance/points.yml && \
+ apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]