From 9ed4cf97c6add4334bec2a5b902456cccec84f9c Mon Sep 17 00:00:00 2001
From: Davlet Panech <davlet.panech@windriver.com>
Date: Wed, 6 Apr 2022 16:34:47 -0400
Subject: [PATCH] debian: base docker image: more required packages

The following packages are required by some containers, because they are
not buildable from source. Install patched versions packaged as DEB
files:
- python3-thriftpy
- python3-nss
- python-nss

TESTS
===================
Build the base image

Story: 2009897
Task: 44971

Depends-On: https://review.opendev.org/c/starlingx/tools/+/837904
Depends-On: https://review.opendev.org/c/starlingx/integ/+/837399

Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: Ic7726e5eb25d253734873209c67dbb54460f1260
---
 .../stx-debian/Dockerfile.stable              | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/build-tools/build-docker-images/stx-debian/Dockerfile.stable b/build-tools/build-docker-images/stx-debian/Dockerfile.stable
index ee47efee..6a1669a4 100644
--- a/build-tools/build-docker-images/stx-debian/Dockerfile.stable
+++ b/build-tools/build-docker-images/stx-debian/Dockerfile.stable
@@ -1,7 +1,7 @@
 # Expected build arguments:
 #   RELEASE: debian release
 #
-ARG RELEASE=bullseye-20220228
+ARG RELEASE=11.3
 FROM debian:${RELEASE}
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -39,6 +39,21 @@ RUN cp -f /etc/apt/sources.list.d/stx.list.disabled /etc/apt/sources.list.d/stx.
         python3-pip \
         python3-wheel \
         libapache2-mod-wsgi-py3 \
-        && \
-    apt-get clean && \
+        ;
+
+# FIXME: these packages are not required by most docker images inheriting
+# from this image. However these Python modules are not buildable from
+# source (ie by pip) on Debian and require patches. Install the patched
+# versions as DEB packages to make sure pip dependencies in derived images
+# are satisfied.
+#
+# A better solution would be to omit them here, but install them in each
+# project that requires them; or add wheel subpackages to these DEBs.
+RUN apt-get install -y \
+    python3-thriftpy \
+    python3-nss \
+    python-nss
+
+# Delete apt cache
+RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/*