From b296b9545e9f7db9730d164312ef420afa7e8040 Mon Sep 17 00:00:00 2001
From: "KHIYANI, RAHUL (rk0850)" <rk0850@att.com>
Date: Mon, 15 Jun 2020 14:24:28 -0500
Subject: [PATCH] Update Ceph Utility Container Image With Latest Packages

upgrade to the non-vulnerable packages as per Clair Scan

Change-Id: Ia120d635c587ef5b4fc3ebd36fe87e2051f5a702
---
 .../templates/bin/_managekey.sh.tpl           | 10 ---------
 images/ceph-utility/Dockerfile.ubuntu_bionic  | 21 ++++++++++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/charts/ceph-utility/templates/bin/_managekey.sh.tpl b/charts/ceph-utility/templates/bin/_managekey.sh.tpl
index dca22581..1d8ddbd9 100644
--- a/charts/ceph-utility/templates/bin/_managekey.sh.tpl
+++ b/charts/ceph-utility/templates/bin/_managekey.sh.tpl
@@ -21,13 +21,3 @@ done < "$input"
 chmod 600 /etc/ceph/ceph.client.admin.keyring
 sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf
 /etc/init.d/rsyslog restart
-{{/*
-These lines will disable extra handler, extra formatter, extra level to the
-root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl.
-These lines will get rid of duplicate logs, generated because of the formatter
-attached by oslo-rootwrap.
-*/}}
-sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
diff --git a/images/ceph-utility/Dockerfile.ubuntu_bionic b/images/ceph-utility/Dockerfile.ubuntu_bionic
index 93122a01..f495da93 100755
--- a/images/ceph-utility/Dockerfile.ubuntu_bionic
+++ b/images/ceph-utility/Dockerfile.ubuntu_bionic
@@ -29,9 +29,6 @@ RUN set -xe \
     && apt-get update \
     && apt-get install -y \
            bash \
-           python3 \
-           python3-pip \
-           python3-oslo.rootwrap \
            moreutils \
            vim \
            sudo \
@@ -47,11 +44,25 @@ RUN set -xe \
            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/* \
+           python3.6 \
+           python3-pip \
+    && pip3 install \
+           oslo.rootwrap==5.8.0 \
+    && apt-get remove --purge -y wget apt-transport-https \
+    && apt-get autoremove -y \
+    && 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 \
-    && rm -rf ${TMP_DIR}
+    && rm -rf \
+         ${TMP_DIR} \
+         /var/lib/apt/lists/*
+
+RUN sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
+    && sed -i "/handler.setFormatter/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
+    && sed -i "/os.path.basename/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
+    && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
+
 CMD ["/bin/bash"]