openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Fix CNI image build" into stable/rocky

This commit is contained in:
Zuul 2020-07-06 08:27:03 +00:00 committed by Gerrit Code Review
parent 77aa18e554 ce4d2176e4
commit f630fe06a1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cni.Dockerfile
View File

@ -3,8 +3,9 @@ LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redh
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt" ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
ARG OSLO_LOCK_PATH=/var/kuryr-lock 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 https://rdoproject.org/repos/rdo-release.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 python-pip iproute bridge-utils openvswitch sudo jq \
&& yum install -y --setopt=tsflags=nodocs gcc python-devel git \ && yum install -y --setopt=tsflags=nodocs gcc python-devel git \
&& pip install -U setuptools && pip install -U setuptools