openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "dockerfile: Fix controller upper constraints" into stable/queens

This commit is contained in:
Zuul 2018-04-23 14:51:01 +00:00 committed by Gerrit Code Review
parent e04d930e94 50f588fa3f
commit 487267cca0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cni.Dockerfile
View File

@ -1,7 +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/tree/upper-constraints.txt?h=stable/queens"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens"
ARG OSLO_LOCK_PATH=/var/kuryr-lock
RUN yum install -y epel-release https://rdoproject.org/repos/rdo-release.rpm \

2
controller.Dockerfile
View File

@ -1,7 +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/tree/upper-constraints.txt?h=stable/queens"
ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens"
COPY . /opt/kuryr-kubernetes