openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Update of dockerfiles. 

In order to properly build cni/controller images, there was a need to
pin setuptools, and alter URI for the upper constraints.

Change-Id: I41eed8d5e3364b98c2a9617dd067d1bea7c0f207
This commit is contained in:
Roman Dobosz 2020-11-19 16:20:28 +01:00
parent 6c9946a7b4
commit 052f8852b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cni.Dockerfile
View File

@ -1,14 +1,14 @@
FROM centos:7
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
ARG UPPER_CONSTRAINTS_FILE="https://opendev.org/openstack/requirements/raw/branch/stable/rocky/upper-constraints.txt"
ARG OSLO_LOCK_PATH=/var/kuryr-lock
ARG PKG_YUM_REPO=https://rdoproject.org/repos/openstack-rocky/rdo-release-rocky-0.noarch.rpm
RUN yum install -y epel-release $PKG_YUM_REPO \
&& yum install -y --setopt=tsflags=nodocs python-pip iproute bridge-utils openvswitch sudo jq \
&& yum install -y --setopt=tsflags=nodocs gcc python-devel git \
&& pip install -U setuptools
&& pip install -U setuptools==40.0.0
COPY . /opt/kuryr-kubernetes

4
controller.Dockerfile
View File

@ -1,12 +1,12 @@
FROM centos:7
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
ARG UPPER_CONSTRAINTS_FILE="https://opendev.org/openstack/requirements/raw/branch/stable/rocky/upper-constraints.txt"
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 \
&& pip install -U setuptools
&& pip install -U setuptools==40.0.0
COPY . /opt/kuryr-kubernetes