summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
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 \