From: zeyu zhu Date: Thu, 22 Dec 2016 08:33:07 +0000 (+0800) Subject: Move Dockerfile to ./docker path X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=escalator.git;a=commitdiff_plain;h=55aac0f5a7d50e33bc1521a24fc5f2d386572ff1 Move Dockerfile to ./docker path 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 --- 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