aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-08-20 15:12:41 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-08-20 15:12:41 +0200
commit2d209e14e0c7f73fa67396877bcc3ab319896059 (patch)
tree8b8964366daa0028dc49130ba7aa1f6c75e485ff /docker
parent56d89152af91b73ee32d74062e7c366ca7d72e47 (diff)
Swith to v1.23 alphas
Change-Id: I226ff09b0a4ca8082736f4d695e67154940ce249 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/cnf/Dockerfile3
-rw-r--r--docker/healthcheck/Dockerfile4
2 files changed, 2 insertions, 5 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index c7cd53d1..adf4c23a 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,11 +1,10 @@
FROM opnfv/functest-kubernetes-core
-ARG K8S_TAG=1.22
ARG CNF_TESTSUITE_TAG=v0.11.2
ARG HELM_TAG=v3.3.1
RUN apk --no-cache add --update wget curl libc6-compat ncurses && \
- tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \
+ tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 4788413d..dc39ca0c 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,9 +1,7 @@
FROM opnfv/functest-kubernetes-core
-ARG K8S_TAG=1.22
-
RUN apk --no-cache add --update curl libc6-compat && \
- tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \
+ tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 \
-s --output /usr/local/bin/kubectl && \