diff options
| author |   Julien <zhang.jun3g@zte.com.cn> | 2016-12-12 22:36:26 +0800 |
|---|---|---|
| committer | Julien <zhang.jun3g@zte.com.cn> | 2016-12-12 22:46:27 +0800 |
| commit | 3069bb6ec1937cefbcf24af4460b72f0915b22f1 (patch) | |
| tree | 28e10ca6a4c777b0a42c907df90a2abf0387a91b | |
| parent | a5276fa675a4ccd32f592ea2a3d28a4f85fb0109 (diff) | |
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 <zhang.jun3g@zte.com.cn>
| -rwxr-xr-x | ci/build_rpm/build_rpms.sh | 2 | ||||
| -rw-r--r-- | docker/Dockerfile (renamed from ci/build_rpm/Dockerfile) | 0 |
2 files changed, 1 insertions, 1 deletions
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 index f10d95e4..f10d95e4 100644 --- a/ci/build_rpm/Dockerfile +++ b/docker/Dockerfile |