From: dave kormann <davek@research.att.com>
Date: Thu, 15 Oct 2020 16:18:04 +0000 (-0400)
Subject: Fix zipp version issue
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fbuild-tools.git;a=commitdiff_plain;h=7dca3e0252134f75444a6e3e1c65a70229aee594

Fix zipp version issue

This change reorders python package installation to fix a problem
that results in the zipp library not being properly installed in
the diskimagebuilder image.

signed-off-by: dave kormann  <davek@research.att.com>
Change-Id: I0d4683ed4df4bd1b8d7e4e9cf329aed0a038ac5f
---

diff --git a/docker-context/Dockerfile-dib b/docker-context/Dockerfile-dib
index 33b0e2b..d1bb65f 100644
--- a/docker-context/Dockerfile-dib
+++ b/docker-context/Dockerfile-dib
@@ -31,14 +31,16 @@ RUN \
         which \
         findutils \
         systemd-udev \
-        PyYAML \
         parted \
         sudo \
         e2fsprogs \
         xfsprogs \
         qemu-img \
         ${EXTRA_RPM:-} && \
+    pip install --upgrade pip && \
     pip install diskimage-builder==2.26.1 && \
+    pip install zipp && \
+    true && \
     yum remove -y python-pip
 RUN find -name 99-selinux-fixfiles-restore -exec rm {} \;