Move Dockerfile to ./docker path 21/26421/3
authorzeyu zhu <zhu.zeyu@zte.com.cn>
Thu, 22 Dec 2016 08:33:07 +0000 (16:33 +0800)
committerzeyu Zhu <zhu.zeyu@zte.com.cn>
Wed, 11 Jan 2017 08:57:06 +0000 (16:57 +0800)
According to other projects(releng/jjb/releng/opnfv-docker.yml), all the
Dockerfiles are put in ./docker path.

The escalator docker build procedure will be seperated from escalator tar file
build procedure. The escalator docker will be directly used during the tar
build procedure. It will help to save the build time.

A seperate job will be created in Jenkins to monitor the Docker changes
and will build the docker image.

Change-Id: I815a8b1043bb0e3b614fa56d0fb793c1c9eb1a0e
Signed-off-by: zeyu zhu <zhu.zeyu@zte.com.cn>
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