Merge pull request #1 from yaodu/more_requirements

More requirements
This commit is contained in:
Pete Birley 2017-01-12 20:14:55 +00:00 committed by GitHub
commit 0f7a9f77fc
3 changed files with 176 additions and 173 deletions

View File

@ -47,7 +47,7 @@ RUN set -x \
&& 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 xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
&& 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
@ -55,6 +55,7 @@ RUN set -x \
&& sed -i "s/spec-cleaner===0.9.1/spec-cleaner===0.9.0/" /root/packages/upper-constraints.txt \
# NOTE(Pete Birley): 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 $(yum history list gcc | tail -2 | head -1 | awk '{ print $1}') \
&& yum clean all \
&& rm -rf /tmp/* /root/.cache

View File

@ -35,11 +35,12 @@ RUN set -x \
&& 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 xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
&& 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 \
build-essential \
ca-certificates \

View File

@ -33,11 +33,12 @@ RUN set -x \
&& 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 xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
&& 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 \
build-essential \
ca-certificates \