openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Apply UC to Dockerfiles 

Upper constraints weren't applied to the Dockerfiles installation so
pip install deps when over it. This commit fixes it by defining a new
env var for it and passit it to pip.

Closes-Bug: #1763752
Change-Id: Id126fee033db6f150ad95c94682eb56b4b2cea03
This commit is contained in:
Daniel Mellado 2018-04-13 13:03:08 +02:00
parent c8aa90029a
commit 2ed3923a0a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cni.Dockerfile
View File

@ -1,6 +1,7 @@
FROM centos:7
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Vikas Choudhary<vichoudh@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
ARG OSLO_LOCK_PATH=/var/kuryr-lock
RUN yum install -y epel-release https://rdoproject.org/repos/rdo-release.rpm \
@ -10,7 +11,7 @@ RUN yum install -y epel-release https://rdoproject.org/repos/rdo-release.rpm \
COPY . /opt/kuryr-kubernetes
RUN cd /opt/kuryr-kubernetes \
&& pip install . \
&& pip install -c $UPPER_CONSTRAINTS_FILE . \
&& rm -fr .git \
&& yum -y history undo last \
&& mkdir ${OSLO_LOCK_PATH}

4
controller.Dockerfile
View File

@ -1,13 +1,15 @@
FROM centos:7
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Vikas Choudhary<vichoudh@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
COPY . /opt/kuryr-kubernetes
RUN yum install -y epel-release \
&& yum install -y --setopt=tsflags=nodocs python-pip \
&& yum install --setopt=tsflags=nodocs --assumeyes inet-tools gcc python-devel wget git \
&& cd /opt/kuryr-kubernetes \
&& pip install --no-cache-dir . \
&& pip install -c $UPPER_CONSTRAINTS_FILE --no-cache-dir . \
&& rm -fr .git \
&& yum -y history undo last \
&& groupadd -r kuryr -g 711 \