From: kong wei <kong.wei2@zte.com.cn>
Date: Sun, 19 Feb 2017 14:59:13 +0000 (+0000)
Subject: Merge "Move Dockerfile to ./docker path"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ebde2dafb975d047e9739874c9cabe4ccc7df7e8;hp=eca769a39045bdf79e915666a0b3a18d50d809b1;p=escalator.git

Merge "Move Dockerfile to ./docker path"
---

diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh
index 81443ca..356e178 100755
--- a/ci/build_rpm/build_rpms.sh
+++ b/ci/build_rpm/build_rpms.sh
@@ -9,7 +9,7 @@ function build_rpm_pkg {
         rm -rf $ESCALATORDIR/build_output
         mkdir -p $ESCALATORDIR/build_output
 
-        sudo docker build -t escalator_rpm .
+        sudo docker build -t escalator_rpm ../../docker
         sudo docker run --rm -v $ESCALATORDIR:/opt/escalator -v $CACHE_DIRECTORY:/home/cache -t  escalator_rpm \
                       /opt/escalator/ci/build_rpm/build_rpms_docker.sh $OPNFV_ARTIFACT_VERSION
 
diff --git a/ci/build_rpm/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from ci/build_rpm/Dockerfile
rename to docker/Dockerfile