x/synergy-scheduler-manager
Code Issues Proposed changes

fix git and pbr when packaging with docker

Browse Source 
- git and pbr were missing
- clean .eggs directory

Change-Id: I8e002dfcd6e9bd27949dfc9e1646c7e5b0c7a323
This commit is contained in:
Vincent Llorens 2016-10-25 10:32:47 +02:00
parent 9afe3c22dd
commit bfe450f868
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/docker/centos7/Dockerfile
View File

@ -1,10 +1,12 @@
FROM centos:7 FROM centos:7
MAINTAINER Vincent Llorens <vincent.llorens@cc.in2p3.fr> MAINTAINER Vincent Llorens <vincent.llorens@cc.in2p3.fr>
RUN yum install -y centos-release-openstack-liberty \ RUN yum install -y centos-release-openstack-liberty \
git-core \
rpm-build \ rpm-build \
python-devel \ python-devel \
python-setuptools \ python-setuptools \
&& yum update -y && 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 mkdir /tmp/python-synergy-scheduler-manager
RUN useradd -m -p pkger pkger RUN useradd -m -p pkger pkger
USER pkger USER pkger

2
packaging/docker/centos7/build.sh
View File

@ -14,7 +14,7 @@ function setup() {
mkdir -p /home/pkger/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} mkdir -p /home/pkger/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
cd $RPMBUILD/SOURCES/ cd $RPMBUILD/SOURCES/
cp -r $PKG_DIR python-synergy-scheduler-manager-$PKG_VERSION 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 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 cp $PKG_DIR/packaging/rpm/python-synergy-scheduler-manager.spec $RPMBUILD/SPECS/python-synergy-scheduler-manager.spec
} }

2
packaging/docker/ubuntu-14.04/build.sh
View File

@ -7,7 +7,7 @@ PKG_DIR=/tmp/python-synergy-scheduler-manager
function copy_source() { function copy_source() {
cd /home/pkger cd /home/pkger
cp -r $PKG_DIR python-synergy-scheduler-manager 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() { function get_version() {