openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Update Python 3 containers to use Fedora 29"

This commit is contained in:
Zuul 2019-04-29 13:05:47 +00:00 committed by Gerrit Code Review
parent d2b223ffca da76fb1f5c
commit f84ee3c2e5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cni_py3.Dockerfile
View File

@ -1,16 +1,17 @@
FROM fedora:28
FROM fedora:29
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 OSLO_LOCK_PATH=/var/kuryr-lock
RUN dnf update -y \
&& dnf install -y --setopt=tsflags=nodocs python3-pip iproute bridge-utils openvswitch sudo \
&& dnf install -y --setopt=tsflags=nodocs gcc python3-devel git
&& dnf install -y --setopt=tsflags=nodocs python36 iproute bridge-utils openvswitch sudo \
&& dnf install -y --setopt=tsflags=nodocs gcc git
COPY . /opt/kuryr-kubernetes
RUN pip3 install -c $UPPER_CONSTRAINTS_FILE /opt/kuryr-kubernetes \
RUN python3.6 -m ensurepip \
&& python3.6 -m pip install -c $UPPER_CONSTRAINTS_FILE /opt/kuryr-kubernetes \
&& cp /opt/kuryr-kubernetes/cni_ds_init /usr/bin/cni_ds_init \
&& mkdir -p /etc/kuryr-cni \
&& cp /opt/kuryr-kubernetes/etc/cni/net.d/* /etc/kuryr-cni \

9
controller_py3.Dockerfile
View File

@ -1,15 +1,16 @@
FROM fedora:28
FROM fedora:29
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"
RUN dnf update -y \
&& dnf install -y --setopt=tsflags=nodocs python3-pip \
&& dnf install -y --setopt=tsflags=nodocs gcc python3-devel git
&& dnf install -y --setopt=tsflags=nodocs python36 \
&& dnf install -y --setopt=tsflags=nodocs gcc git
COPY . /opt/kuryr-kubernetes
RUN pip3 install -c $UPPER_CONSTRAINTS_FILE --no-cache-dir /opt/kuryr-kubernetes \
RUN python3.6 -m ensurepip \
&& python3.6 -m pip install -c $UPPER_CONSTRAINTS_FILE --no-cache-dir /opt/kuryr-kubernetes \
&& dnf -y history undo last \
&& rm -rf /opt/kuryr-kubernetes \
&& groupadd -r kuryr -g 711 \