From 79381cfa0333d6fba2f0b7a631babc33956b6bf8 Mon Sep 17 00:00:00 2001
From: "KAVVA, JAGAN MOHAN REDDY (jk330k)" <jk330k@att.com>
Date: Mon, 18 May 2020 08:23:14 -0500
Subject: [PATCH] Update Postgresql Utility Container Image

Update Postgresql Utility Container Image so that it uses non vulnerable
packages.

Change-Id: I44b112f4741af7960dcc54c35615e1b55d25f22e
---
 .../templates/bin/_start.sh.tpl               | 10 --------
 .../Dockerfile.ubuntu_bionic                  | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/charts/postgresql-utility/templates/bin/_start.sh.tpl b/charts/postgresql-utility/templates/bin/_start.sh.tpl
index 91a013e7..e033a92f 100644
--- a/charts/postgresql-utility/templates/bin/_start.sh.tpl
+++ b/charts/postgresql-utility/templates/bin/_start.sh.tpl
@@ -15,13 +15,3 @@ limitations under the License.
 set -ex
 sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf
 /etc/init.d/rsyslog start
-{{/*
-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/postgresql-utility/Dockerfile.ubuntu_bionic b/images/postgresql-utility/Dockerfile.ubuntu_bionic
index 20f3bf5b..9dc4d023 100644
--- a/images/postgresql-utility/Dockerfile.ubuntu_bionic
+++ b/images/postgresql-utility/Dockerfile.ubuntu_bionic
@@ -1,4 +1,4 @@
-ARG FROM=ubuntu:18.04
+ARG FROM=docker.io/ubuntu:bionic
 FROM ${FROM}
 
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@@ -17,16 +17,23 @@ RUN set -xe && \
     apt-transport-https ca-certificates gnupg \
     bash \
     moreutils \
-    postgresql-client \
-    postgresql-common \
-    python3-pip \
-    python3-oslo.rootwrap \
-    python3-openstackclient \
-    python3-swiftclient \
     rsyslog \
     screen \
-    sudo && \
+    sudo \
+    postgresql-client \
+    postgresql-common \
+    python3.6 \
+    python3-pip && \
+    pip3 install \
+      oslo.rootwrap==5.8.0 \
+      openstackclient \
+      python-swiftclient && \
     apt-get clean -y && \
     rm -rf /var/cache/debconf/* /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"]