diff options
| author |   kong wei <kong.wei2@zte.com.cn> | 2017-02-19 14:59:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-19 14:59:13 +0000 |
| commit | ebde2dafb975d047e9739874c9cabe4ccc7df7e8 (patch) | |
| tree | 6afc6d91042d2b55d8333f170542a4fe55b2db40 /ci | |
| parent | eca769a39045bdf79e915666a0b3a18d50d809b1 (diff) | |
| parent | 55aac0f5a7d50e33bc1521a24fc5f2d386572ff1 (diff) | |
Merge "Move Dockerfile to ./docker path"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build_rpm/Dockerfile | 29 | ||||
| -rwxr-xr-x | ci/build_rpm/build_rpms.sh | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/ci/build_rpm/Dockerfile b/ci/build_rpm/Dockerfile deleted file mode 100644 index 48e254f..0000000 --- a/ci/build_rpm/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM centos:7
-LABEL escalator_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 \
- 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 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
|