summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2016-12-12 22:36:26 +0800
committerJulien <zhang.jun3g@zte.com.cn>2016-12-12 22:46:27 +0800
commit3069bb6ec1937cefbcf24af4460b72f0915b22f1 (patch)
tree28e10ca6a4c777b0a42c907df90a2abf0387a91b /ci
parenta5276fa675a4ccd32f592ea2a3d28a4f85fb0109 (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>
Diffstat (limited to 'ci')
-rw-r--r--ci/build_rpm/Dockerfile51
-rwxr-xr-xci/build_rpm/build_rpms.sh2
2 files changed, 1 insertions, 52 deletions
diff --git a/ci/build_rpm/Dockerfile b/ci/build_rpm/Dockerfile
deleted file mode 100644
index f10d95e4..00000000
--- a/ci/build_rpm/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM centos:7
-LABEL daisy_image_version=1.0
-RUN yum -y update
-RUN yum -y install centos-release-openstack-newton
-RUN yum -y install \
- wget \
- coreutils \
- which \
- gawk \
- grep \
- git \
- intltool \
- make \
- rpm \
- rpm-build \
- python-sphinx \
- python-XStatic-Angular \
- python-XStatic-Angular-Bootstrap \
- python-XStatic-Angular-lrdragndrop \
- python-XStatic-Angular-Mock \
- python-XStatic-Bootstrap-Datepicker \
- python-XStatic-Bootstrap-SCSS \
- python-XStatic-D3 \
- python-XStatic-Font-Awesome \
- python-XStatic-Hogan \
- python-XStatic-Jasmine \
- python-XStatic-jQuery \
- python-XStatic-JQuery-Migrate \
- python-XStatic-JQuery-quicksearch \
- python-XStatic-JQuery-TableSorter \
- python-XStatic-jquery-ui \
- python-XStatic-JSEncrypt \
- python-XStatic-Magic-Search \
- python-XStatic-QUnit \
- python-XStatic-Rickshaw \
- python-XStatic-smart-table \
- python-XStatic-Spin \
- python-XStatic-termjs \
- python2-oslo-sphinx \
- python2-oslo-messaging \
- python2-oslo-concurrency \
- python2-oslo-sphinx \
- python-devel \
- python-d2to1 \
- python-django-compressor \
- python-django-openstack-auth \
- python-django-pyscss \
- python-lesscpy \
- python-migrate \
- python-pint \
- python-routes
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 \