x
/
synergy-service
Code Issues Proposed changes

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
This commit is contained in:
Vincent Llorens 2016-10-18 13:04:42 +02:00
parent 670f608252
commit 2e15008a9e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/docker/ubuntu-14.04/Dockerfile
View File

@ -1,5 +1,7 @@
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER Vincent Llorens <vincent.llorens@cc.in2p3.fr> MAINTAINER Vincent Llorens <vincent.llorens@cc.in2p3.fr>
RUN apt-get update && apt-get install -y software-properties-common
RUN add-apt-repository cloud-archive:liberty
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y build-essential \ && apt-get install -y build-essential \
debhelper \ debhelper \

2
setup.py
View File

@ -23,5 +23,5 @@ except ImportError:
pass pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=1.8', 'setuptools>=17.1'], setup_requires=['pbr>=1.8', 'setuptools'],
pbr=True) pbr=True)