Merge "Move Dockerfile to ./docker path"
authorkong wei <kong.wei2@zte.com.cn>
Sun, 19 Feb 2017 14:59:13 +0000 (14:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 19 Feb 2017 14:59:13 +0000 (14:59 +0000)
ci/build_rpm/build_rpms.sh
docker/Dockerfile [moved from ci/build_rpm/Dockerfile with 100% similarity]

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