From 2e15008a9e69ec16e5f39df9fe216fd392b006a2 Mon Sep 17 00:00:00 2001 From: Vincent Llorens Date: Tue, 18 Oct 2016 13:04:42 +0200 Subject: [PATCH] fix required packages when packaging - ubuntu Dockerfile didn't have the Ubuntu OpenStack repository. - required version of setuptools was too high wrt the versions available for CentOS and Ubuntu. Change-Id: I7ab657e53e48658c08c02020256be97cd5d3af66 Sem-Ver: bugfix --- packaging/docker/ubuntu-14.04/Dockerfile | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/docker/ubuntu-14.04/Dockerfile b/packaging/docker/ubuntu-14.04/Dockerfile index 5263747..15187fd 100644 --- a/packaging/docker/ubuntu-14.04/Dockerfile +++ b/packaging/docker/ubuntu-14.04/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:14.04 MAINTAINER Vincent Llorens +RUN apt-get update && apt-get install -y software-properties-common +RUN add-apt-repository cloud-archive:liberty RUN apt-get update \ && apt-get install -y build-essential \ debhelper \ diff --git a/setup.py b/setup.py index fd6b2bd..f06a663 100644 --- a/setup.py +++ b/setup.py @@ -23,5 +23,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8', 'setuptools>=17.1'], + setup_requires=['pbr>=1.8', 'setuptools'], pbr=True)