diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-04 12:57:09 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-04 13:20:19 +0100 |
| commit | 86ceeae0d9a70bda4ccaa64de947fb0c232849bb (patch) | |
| tree | fbc4687d2d5f6c2f5a788b21d797b3b999b91f3a /docker/cnf/Dockerfile | |
| parent | 72d70b93805d2f0f8cd8e46f3cdabb15ba8ec292 (diff) | |
Allow parameterizing K8s versions
ONAP integration team asks to support all K8s versions.
A couple of OPNFV releases will allow testing 2 K8s versions.
Change-Id: Idb43cff0cc03cc9c17b290f7f1867e2c380c6319
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 0163bb977604a32a0c46e10a97313ce0feea7b5f)
Diffstat (limited to 'docker/cnf/Dockerfile')
| -rw-r--r-- | docker/cnf/Dockerfile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index f99ff090..c03dcea1 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,19 +1,20 @@ FROM opnfv/functest-kubernetes-core:iruya +ARG K8S_TAG=1.15 ARG CNF_CONFORMANCE_TAG=v0.9.19 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ - K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-1.15.txt) && \ - 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 \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ + case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ + curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ - curl https://get.helm.sh/helm-$HELM_TAG-linux-$ARCH.tar.gz \ - --output /src/helm-$HELM_TAG-linux-$ARCH.tar.gz && \ - tar zxf /src/helm-$HELM_TAG-linux-$ARCH.tar.gz linux-$ARCH/helm -C /src && \ - mv /src/linux-$ARCH/helm /usr/local/bin && \ + curl https://get.helm.sh/helm-$HELM_TAG-linux-$arch.tar.gz \ + --output /src/helm-$HELM_TAG-linux-$arch.tar.gz && \ + tar zxf /src/helm-$HELM_TAG-linux-$arch.tar.gz linux-$arch/helm -C /src && \ + mv /src/linux-$arch/helm /usr/local/bin && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ - rm -r /src/helm-$HELM_TAG-linux-$ARCH.tar.gz /src/linux-$ARCH && \ + rm -r /src/helm-$HELM_TAG-linux-$arch.tar.gz /src/linux-$arch && \ case $(uname -m) in x86_64) \ curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz \ -L --output /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz && \ |