aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2025-01-19 17:30:20 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2025-01-19 17:30:20 +0100
commita7a6b73a68b80962487101c97980d46b7eee8d82 (patch)
tree4513d6d8598ebc8b82e085a2fa52e5a9389fba32
parentd1dd87251f782894e688d0bd73ab2fad91d8c6a1 (diff)
Add missing && \
Change-Id: Ifbfe8b8d40ac370ed27a2f62c06dd6096d885b2d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/cnf/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 9876d230..7f037e00 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -6,7 +6,7 @@ ARG HELM_TAG=v3.6.0
USER root
RUN apk --no-cache add --update wget curl ncurses git yaml openssl zlib && \
apk --no-cache add --virtual .build-deps --update crystal shards make yaml-dev openssl-dev zlib-dev patch openssl-libs-static yaml-static zlib-static && \
- tag=$(curl -Ls https://dl.k8s.io/release/latest.txt)
+ tag=$(curl -Ls https://dl.k8s.io/release/latest.txt) && \
case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \
curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \
--output /usr/local/bin/kubectl && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 760a156f..0ab3217c 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-kubernetes-core
USER root
RUN apk --no-cache add --update curl libc6-compat && \
- tag=$(curl -Ls https://dl.k8s.io/release/latest.txt)
+ tag=$(curl -Ls https://dl.k8s.io/release/latest.txt) && \
case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \
curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \
--output /usr/local/bin/kubectl && \