From 55aac0f5a7d50e33bc1521a24fc5f2d386572ff1 Mon Sep 17 00:00:00 2001
From: zeyu zhu <zhu.zeyu@zte.com.cn>
Date: Thu, 22 Dec 2016 16:33:07 +0800
Subject: Move Dockerfile to ./docker path

According to other projects(releng/jjb/releng/opnfv-docker.yml), all the
Dockerfiles are put in ./docker path.

The escalator docker build procedure will be seperated from escalator tar file
build procedure. The escalator docker will be directly used during the tar
build procedure. It will help to save the build time.

A seperate job will be created in Jenkins to monitor the Docker changes
and will build the docker image.

Change-Id: I815a8b1043bb0e3b614fa56d0fb793c1c9eb1a0e
Signed-off-by: zeyu zhu <zhu.zeyu@zte.com.cn>
---
 ci/build_rpm/Dockerfile    | 29 -----------------------------
 ci/build_rpm/build_rpms.sh |  2 +-
 docker/Dockerfile          | 29 +++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 ci/build_rpm/Dockerfile
 create mode 100644 docker/Dockerfile

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
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..48e254f
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,29 @@
+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
-- 
cgit 1.2.3-korg