From cdfc1a1dff08dfdec3a29810451ae472ad7a3f96 Mon Sep 17 00:00:00 2001
From: Cole Walker <cole.walker@windriver.com>
Date: Tue, 6 Sep 2022 16:24:57 -0400
Subject: [PATCH] Fix build failure for ptp-notification images

Fixes a pip install error when building the notificationservice-base,
notificationclient-base and locationservice-base images:
ModuleNotFoundError: No module named 'setuptools_rust'

It appears that an upstream change to oslo.messaging has caused the
setuptools_rust dependency to not be found. Updating pip3 before
installing additional modules resolves this issue.

Closes-Bug: 1988854

Signed-off-by: Cole Walker <cole.walker@windriver.com>
Change-Id: If568191b3e8feb1c23bdbc4168e495395567846d
---
 locationservice-base/centos/Dockerfile     | 1 +
 notificationclient-base/centos/Dockerfile  | 1 +
 notificationservice-base/centos/Dockerfile | 1 +
 3 files changed, 3 insertions(+)

diff --git a/locationservice-base/centos/Dockerfile b/locationservice-base/centos/Dockerfile
index bae0a55..dd41bc5 100644
--- a/locationservice-base/centos/Dockerfile
+++ b/locationservice-base/centos/Dockerfile
@@ -10,6 +10,7 @@ RUN set -ex ;\
         $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \
         -y \
         gcc python3-devel python3-pip \
+        && pip3 install --upgrade pip \
         && pip3 install --user pecan \
         && pip3 install oslo-config \
         && pip3 install oslo-messaging \
diff --git a/notificationclient-base/centos/Dockerfile b/notificationclient-base/centos/Dockerfile
index 00d36ae..e898387 100644
--- a/notificationclient-base/centos/Dockerfile
+++ b/notificationclient-base/centos/Dockerfile
@@ -10,6 +10,7 @@ RUN set -ex ;\
         $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \
         -y \
         gcc python3-devel python3-pip \
+        && pip3 install --upgrade pip \
         && pip3 install --user pecan \
         && pip3 install oslo-config \
         && pip3 install oslo-messaging \
diff --git a/notificationservice-base/centos/Dockerfile b/notificationservice-base/centos/Dockerfile
index cf916a0..a1557e6 100644
--- a/notificationservice-base/centos/Dockerfile
+++ b/notificationservice-base/centos/Dockerfile
@@ -10,6 +10,7 @@ RUN set -ex ;\
         $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \
         -y \
         gcc python3-devel python3-pip \
+        && pip3 install --upgrade pip \
         && pip3 install --user pecan \
         && pip3 install pygtail \
         && pip3 install oslo-config \