From fa9f5541249d233d0249edb0d6150581d3e55df4 Mon Sep 17 00:00:00 2001
From: Vincent Llorens <vincent.llorens@cc.in2p3.fr>
Date: Tue, 21 Feb 2017 14:47:53 +0100
Subject: [PATCH] simplify packaging with docker

Small tweak to the docker CLI invokation when packaging to make it less
verbose.

Related: Ida07b3b439949fe83066039350647901693d4816
Sem-Ver: bugfix
Change-Id: I6a9bc7d3686a1b116d664db77f072b004b30fd25
---
 packaging/README.md                      | 2 +-
 packaging/docker/centos7/Dockerfile      | 2 +-
 packaging/docker/centos7/build.sh        | 2 +-
 packaging/docker/ubuntu-14.04/Dockerfile | 2 +-
 packaging/docker/ubuntu-14.04/build.sh   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/README.md b/packaging/README.md
index 28b89c4..0327f63 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -12,7 +12,7 @@
 2. run the image
 
   ```shell
-  Docker run -i -v /path/to/synergy-scheduler-manager:/tmp/python-synergy-scheduler-manager scheduler-builder-{centos7,ubuntu-14.04}
+  Docker run -i -v /path/to/synergy-scheduler-manager:/tmp/synergy scheduler-builder-{centos7,ubuntu-14.04}
   ```
   the deb/rpm will be output in `path/to/synergy-scheduler-manager/build`
 
diff --git a/packaging/docker/centos7/Dockerfile b/packaging/docker/centos7/Dockerfile
index e29f2ad..c062851 100644
--- a/packaging/docker/centos7/Dockerfile
+++ b/packaging/docker/centos7/Dockerfile
@@ -7,7 +7,7 @@ RUN yum install -y centos-release-openstack-liberty \
                    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 mkdir /tmp/synergy
 RUN useradd -m -p pkger pkger
 USER pkger
 COPY build.sh /home/pkger/
diff --git a/packaging/docker/centos7/build.sh b/packaging/docker/centos7/build.sh
index e9b9f2d..91013ef 100644
--- a/packaging/docker/centos7/build.sh
+++ b/packaging/docker/centos7/build.sh
@@ -2,7 +2,7 @@
 set -e -x
 
 RPMBUILD=/home/pkger/rpmbuild
-PKG_DIR=/tmp/python-synergy-scheduler-manager
+PKG_DIR=/tmp/synergy
 
 
 function get_version() {
diff --git a/packaging/docker/ubuntu-14.04/Dockerfile b/packaging/docker/ubuntu-14.04/Dockerfile
index d5813a2..646c10b 100644
--- a/packaging/docker/ubuntu-14.04/Dockerfile
+++ b/packaging/docker/ubuntu-14.04/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
                           python-all \
                           python-pbr \
                           python-setuptools
-RUN mkdir /tmp/python-synergy-scheduler-manager
+RUN mkdir /tmp/synergy
 RUN useradd -m -p pkger pkger
 USER pkger
 COPY build.sh /home/pkger/build.sh
diff --git a/packaging/docker/ubuntu-14.04/build.sh b/packaging/docker/ubuntu-14.04/build.sh
index 209e4c3..bf2dc2b 100644
--- a/packaging/docker/ubuntu-14.04/build.sh
+++ b/packaging/docker/ubuntu-14.04/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e -x
 
-PKG_DIR=/tmp/python-synergy-scheduler-manager
+PKG_DIR=/tmp/synergy
 
 
 function copy_source() {