From d05002b02d03bbe9e0579e21a506e4620d52b786 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 20 Sep 2017 15:10:49 -0400
Subject: [PATCH] python-nss was fixed to work with wheel

This work around is no longer needed

Change-Id: Ifff9f3be35e14d87b49a7cbb5a794bd90c8981dd
---
 centos/Dockerfile | 8 --------
 debian/Dockerfile | 8 --------
 ubuntu/Dockerfile | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/centos/Dockerfile b/centos/Dockerfile
index 72ff4bb..2c45494 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -49,14 +49,6 @@ RUN set -x \
     && python -m virtualenv /builder \
     && pip install -U pip \
     && pip install -U wheel setuptools \
-    # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
-    && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
-    && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
-    && mkdir /tmp/python-nss \
-    && tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
-    && sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
-    && pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
-    # NOTE(SamYaple): end bug workaround
     && pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
         uwsgi \
     && yum history -y undo 4 5 \
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 2a36529..04d8f6e 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -43,14 +43,6 @@ RUN set -x \
     && python -m virtualenv /builder \
     && pip install -U pip \
     && pip install -U wheel setuptools \
-    # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
-    && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
-    && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
-    && mkdir /tmp/python-nss \
-    && tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
-    && sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
-    && pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
-    # NOTE(SamYaple): end bug workaround
     && pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
         uwsgi \
     && apt-get purge -y --auto-remove \
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index df71db2..6fca004 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -43,14 +43,6 @@ RUN set -x \
     && python -m virtualenv /builder \
     && pip install -U pip \
     && pip install -U wheel setuptools \
-    # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
-    && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
-    && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
-    && mkdir /tmp/python-nss \
-    && tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
-    && sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
-    && pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
-    # NOTE(SamYaple): end bug workaround
     && pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
         uwsgi \
     && apt-get purge -y --auto-remove \