From: Julien Date: Mon, 12 Dec 2016 14:36:26 +0000 (+0800) Subject: Move Dockerfile to ./docker path X-Git-Tag: 1.0.0~75 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F25801%2F1;p=daisy.git Move Dockerfile to ./docker path According to other projects(releng/jjb/releng/opnfv-docker.yml), all the Dockerfiles are put in ./docker path. The daisy docker build procedure will be seperated from daisy bin file build procedure. The daisy docker will be directly used during the bin build procedure. It will help to safe the build time. A seperate job will be created in Jenkins to monitor the Docker changes and will build the docker image. Change-Id: Ib68ec3657d7296041aa9dc99f8e578cb0466679f Signed-off-by: Julien --- diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh index c7bcf245..e0472a24 100755 --- a/ci/build_rpm/build_rpms.sh +++ b/ci/build_rpm/build_rpms.sh @@ -17,7 +17,7 @@ function build_rpm_pkg { rm -rf $DAISYDIR/build_output mkdir -p $DAISYDIR/build_output - sudo docker build -t daisy4nfv_rpm . + sudo docker build -t daisy4nfv_rpm ../../docker sudo docker run --rm -v $DAISYDIR:/opt/daisy4nfv \ -v $CACHE_DIRECTORY:/home/cache \ -t daisy4nfv_rpm \ diff --git a/ci/build_rpm/Dockerfile b/docker/Dockerfile similarity index 100% rename from ci/build_rpm/Dockerfile rename to docker/Dockerfile