From bfe450f8687a84ef2870ece86d0f940e5629c984 Mon Sep 17 00:00:00 2001
From: Vincent Llorens <vincent.llorens@cc.in2p3.fr>
Date: Tue, 25 Oct 2016 10:32:47 +0200
Subject: [PATCH] fix git and pbr when packaging with docker

- git and pbr were missing
- clean .eggs directory

Change-Id: I8e002dfcd6e9bd27949dfc9e1646c7e5b0c7a323
---
 packaging/docker/centos7/Dockerfile    | 2 ++
 packaging/docker/centos7/build.sh      | 2 +-
 packaging/docker/ubuntu-14.04/build.sh | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packaging/docker/centos7/Dockerfile b/packaging/docker/centos7/Dockerfile
index 9ed9aa8..e29f2ad 100644
--- a/packaging/docker/centos7/Dockerfile
+++ b/packaging/docker/centos7/Dockerfile
@@ -1,10 +1,12 @@
 FROM centos:7
 MAINTAINER Vincent Llorens <vincent.llorens@cc.in2p3.fr>
 RUN yum install -y centos-release-openstack-liberty \
+                   git-core \
                    rpm-build \
                    python-devel \
                    python-setuptools \
     && yum update -y
+RUN yum install -y python-pbr  # Needs centos-release-openstack-* to be installed first
 RUN mkdir /tmp/python-synergy-scheduler-manager
 RUN useradd -m -p pkger pkger
 USER pkger
diff --git a/packaging/docker/centos7/build.sh b/packaging/docker/centos7/build.sh
index ee0f91a..e64037e 100644
--- a/packaging/docker/centos7/build.sh
+++ b/packaging/docker/centos7/build.sh
@@ -14,7 +14,7 @@ function setup() {
     mkdir -p /home/pkger/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
     cd $RPMBUILD/SOURCES/
     cp -r $PKG_DIR python-synergy-scheduler-manager-$PKG_VERSION
-    rm -r python-synergy-scheduler-manager-$PKG_VERSION/{.tox,.testrepository,build,dist} || true
+    rm -r python-synergy-scheduler-manager-$PKG_VERSION/{.eggs,.tox,.testrepository,build,dist} || true
     tar cjf python-synergy-scheduler-manager-${PKG_VERSION}.tar.bz2 python-synergy-scheduler-manager-$PKG_VERSION
     cp $PKG_DIR/packaging/rpm/python-synergy-scheduler-manager.spec $RPMBUILD/SPECS/python-synergy-scheduler-manager.spec
 }
diff --git a/packaging/docker/ubuntu-14.04/build.sh b/packaging/docker/ubuntu-14.04/build.sh
index 1cdc709..5a3bcb5 100644
--- a/packaging/docker/ubuntu-14.04/build.sh
+++ b/packaging/docker/ubuntu-14.04/build.sh
@@ -7,7 +7,7 @@ PKG_DIR=/tmp/python-synergy-scheduler-manager
 function copy_source() {
     cd /home/pkger
     cp -r $PKG_DIR python-synergy-scheduler-manager
-    rm -r python-synergy-scheduler-manager/{.tox,.testrepository,build,dist} || true
+    rm -r python-synergy-scheduler-manager/{.eggs,.tox,.testrepository,build,dist} || true
 }
 
 function get_version() {