From c9cffd6979c49e503255ec98f89ffc8f39e3f2e8 Mon Sep 17 00:00:00 2001
From: Matthew Heler <matthew.heler@hotmail.com>
Date: Wed, 23 Jan 2019 07:27:24 -0600
Subject: [PATCH] [CEPH UTILITY] Add missing support binaries

Add missing support binaries needed for performing backups from the
utility container.

Change-Id: Iec150f67664bd7c5a750ddee0c1f45f75184af36
---
 ceph-utility/Dockerfile.ubuntu_xenial | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ceph-utility/Dockerfile.ubuntu_xenial b/ceph-utility/Dockerfile.ubuntu_xenial
index 08481be3..d0681ed8 100644
--- a/ceph-utility/Dockerfile.ubuntu_xenial
+++ b/ceph-utility/Dockerfile.ubuntu_xenial
@@ -2,16 +2,22 @@ ARG FROM=docker.io/ubuntu:xenial
 FROM ${FROM}
 
 ARG CEPH_RELEASE=mimic
+ARG KUBE_VERSION=1.12.2
 
 RUN set -xe \
+    && export DEBIAN_FRONTEND=noninteractive \
     && sed -i '/nobody/d' /etc/passwd \
     && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update && apt-get install -y wget curl apt-transport-https gnupg\
+    && apt-get update && apt-get dist-upgrade -y \
+    && apt-get install -y wget curl apt-transport-https ca-certificates gnupg\
     && wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - \
     && echo deb https://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list \
-    && apt-get update && apt-get install -y bash python-oslo.rootwrap moreutils vim sudo screen ceph-common python-rbd radosgw rsyslog x11-apps jq \
+    && apt-get update && apt-get install -y bash python-oslo.rootwrap moreutils vim sudo screen ceph ceph-common python-rbd radosgw hexedit jq s3cmd rsyslog rsync xz-utils iperf \
     && apt-get remove --purge -y wget apt-transport-https && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && curl -sSL https://bootstrap.pypa.io/get-pip.py | python \
-    && pip --no-cache-dir install --upgrade rgwadmin crush
-
+    && 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 \
+    && rm -rf ${TMP_DIR}
 CMD ["/bin/bash"]