diff --git a/images/ceph-utility/Dockerfile.ubuntu_bionic b/images/ceph-utility/Dockerfile.ubuntu_bionic index f495da93..2dc6b98a 100755 --- a/images/ceph-utility/Dockerfile.ubuntu_bionic +++ b/images/ceph-utility/Dockerfile.ubuntu_bionic @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc # Nautilus 14.2.9 ARG CEPH_RELEASE=nautilus ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic -ARG KUBE_VERSION=1.16.2 +ARG KUBE_VERSION=1.17.3 ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/ ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key @@ -53,9 +53,10 @@ RUN set -xe \ && apt-get clean \ && TMP_DIR=$(mktemp --directory) \ && cd ${TMP_DIR} \ - && curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 \ - && mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \ - && chmod +x /usr/bin/kubectl \ + && curl -sSLO https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \ + && tar -xvf ${TMP_DIR}/kubernetes-client-linux-amd64.tar.gz --strip-components=1 \ + -C /usr/bin kubernetes/client/bin/kubectl \ + && mv /usr/bin/client/bin/kubectl /usr/bin/kubectl \ && rm -rf \ ${TMP_DIR} \ /var/lib/apt/lists/* diff --git a/images/compute-utility/Dockerfile.ubuntu_bionic b/images/compute-utility/Dockerfile.ubuntu_bionic index 7c2666b4..93c155a6 100755 --- a/images/compute-utility/Dockerfile.ubuntu_bionic +++ b/images/compute-utility/Dockerfile.ubuntu_bionic @@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc org.opencontainers.image.vendor='The Airship Authors' \ org.opencontainers.image.licenses='Apache-2.0' -ARG KUBE_VERSION=1.12.2 +ARG KUBE_VERSION=1.17.3 ARG DEBIAN_FRONTEND=noninteractive @@ -42,9 +42,9 @@ RUN set -xe \ && TMP_DIR=$(mktemp --directory) \ && cd ${TMP_DIR} \ && curl -sSLO https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \ - && tar --strip-components=1 -zxvf kubernetes-client-linux-amd64.tar.gz \ - && mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \ - && chmod +x /usr/bin/kubectl \ + && tar -xvf ${TMP_DIR}/kubernetes-client-linux-amd64.tar.gz --strip-components=1 \ + -C /usr/bin kubernetes/client/bin/kubectl \ + && mv /usr/bin/client/bin/kubectl /usr/bin/kubectl \ && rm -rf \ ${TMP_DIR} \ /var/lib/apt/lists/*