From 56591e6316dec54c93010d36b9103b7d45652057 Mon Sep 17 00:00:00 2001
From: Frank Ritchie <fr801x@att.com>
Date: Mon, 28 Sep 2020 14:20:47 -0400
Subject: [PATCH] Minimize ceph-daemon image size

These changes are to minimize the ceph-daemon image size as is
recommended by industry standard best practices. The main changes
are the removal of various debugging tools such as:

valgrind
hexedit
sysstat
dstat
iperf

as well as compilers and debuggers

gcc
gcc-7
cpp-7
gdb

Etcdctl and forego are also removed.

Change-Id: I9502c5f297b1bfcdaafb82ae438f3ba6382c2c64
---
 ceph-daemon/Dockerfile.ubuntu_bionic | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/ceph-daemon/Dockerfile.ubuntu_bionic b/ceph-daemon/Dockerfile.ubuntu_bionic
index e3d31a65..2f363bf2 100644
--- a/ceph-daemon/Dockerfile.ubuntu_bionic
+++ b/ceph-daemon/Dockerfile.ubuntu_bionic
@@ -5,7 +5,6 @@ ARG KUBE_VERSION=1.16.2
 # Nautilus 14.2.10
 ARG CEPH_RELEASE=nautilus
 ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic
-ARG ETCDCTL_VERSION=3.4.3
 ARG CONFD_VERSION=0.16.0
 
 ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
@@ -36,20 +35,13 @@ RUN set -ex ;\
         rbd-mirror=${CEPH_RELEASE_TAG} \
         rbd-fuse=${CEPH_RELEASE_TAG} \
         s3cmd \
-        strace \
-        valgrind \
-        hexedit \
-        sysstat \
-        dstat \
         smartmontools \
-        sdparm \
+        strace \
         tcpdump \
-        iperf \
+        sdparm \
         xfsprogs \
         rsync \
         curl \
-        gcc \
-        gdb \
         python3 \
         python3-dev \
         uuid-runtime \
@@ -63,11 +55,6 @@ RUN set -ex ;\
     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/local/bin/kubectl ;\
     chmod +x /usr/local/bin/kubectl ;\
-    curl -sSL https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.tgz | tar xfz - -C /usr/local/bin/ ;\
-    chmod +x /usr/local/bin/forego ;\
-    curl -sSL https://github.com/coreos/etcd/releases/download/v${ETCDCTL_VERSION}/etcd-v${ETCDCTL_VERSION}-linux-amd64.tar.gz | tar xfz - ;\
-    mv ${TMP_DIR}/etcd-v${ETCDCTL_VERSION}-linux-amd64/etcdctl /usr/local/bin/etcdctl ;\
-    chmod +xr /usr/local/bin/etcdctl ;\
     curl -sSL https://github.com/kelseyhightower/confd/releases/download/v${CONFD_VERSION}/confd-${CONFD_VERSION}-linux-amd64 -o /usr/local/bin/confd ;\
     chmod +xr /usr/local/bin/confd ;\
     curl -sSL https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz | tar xfz - ;\
@@ -77,7 +64,9 @@ RUN set -ex ;\
     rm -rf ${TMP_DIR} ;\
     apt-get purge -y --auto-remove \
         python3-dev \
-        gcc ;\
+        gcc \
+        gcc-7 \
+        cpp-7 ;\
     rm -rf /var/lib/apt/lists/* ;\
     rm -rf /usr/share/doc/ ;\
     rm -rf /usr/share/man/ ;\