From 7e52b9ef3f887a4fc99e4419733d2e802b01cb7d Mon Sep 17 00:00:00 2001 From: Daniel Mellado Date: Thu, 21 Jun 2018 13:49:26 +0200 Subject: [PATCH] Fix container image creation. This commit fixes the container creation due to centos shipping an older version of setuptools. [1] [1] https://github.com/openaps/openaps/issues/95 Closes-Bug: 1778048 Change-Id: Ifbce25a5a49cbc3df58850b10819843e640c8f26 --- cni.Dockerfile | 3 ++- controller.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cni.Dockerfile b/cni.Dockerfile index c749f57d3..ea21f7d69 100644 --- a/cni.Dockerfile +++ b/cni.Dockerfile @@ -6,7 +6,8 @@ ARG OSLO_LOCK_PATH=/var/kuryr-lock RUN yum install -y epel-release https://rdoproject.org/repos/rdo-release.rpm \ && 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 COPY . /opt/kuryr-kubernetes diff --git a/controller.Dockerfile b/controller.Dockerfile index a7e7adfc0..14f188b28 100644 --- a/controller.Dockerfile +++ b/controller.Dockerfile @@ -5,7 +5,8 @@ ARG UPPER_CONSTRAINTS_FILE="https://git.openstack.org/cgit/openstack/requirement 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 + && yum install --setopt=tsflags=nodocs --assumeyes inet-tools gcc python-devel wget git \ + && pip install -U setuptools COPY . /opt/kuryr-kubernetes