From c84e4a663343a1d19073ce73a5c0596a99d84a52 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Thu, 29 Sep 2016 17:44:20 +0200
Subject: Propose common directory for Docker related files

Proposal 3 from this wiki:
https://wiki.opnfv.org/display/INF/Docker+handling+in+CI#DockerhandlinginCI-3Dockerfilelocation

Do not merge before this:
https://gerrit.opnfv.org/gerrit/#/c/22565/

JIRA: RELENG-148

Change-Id: I07e1418ae06c59e6c4d495c8c87d28addbb98d03
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 ci/docker/Dockerfile | 49 -------------------------------------------------
 docker/Dockerfile    | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 ci/docker/Dockerfile
 create mode 100644 docker/Dockerfile

diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
deleted file mode 100644
index f5ac0e86..00000000
--- a/ci/docker/Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-FROM ubuntu:14.04
-MAINTAINER MatthewLi <matthew.lijun@huawei.com>
-
-LABEL image=opnfv/bottlenecks
-
-# GIT repo directory
-ENV REPOS_DIR /home/opnfv
-
-# Bottlenecks repo
-ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
-ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
-ENV creds ${BOTTLENECKS_REPO_DIR}/config/openstack.creds
-
-#new test suite required packages can be added here
-RUN apt-get update && apt-get install -y \
-    libffi-dev \
-    libssl-dev \
-    libxml2-dev \
-    libxslt1-dev \
-    curl \
-    wget \
-    git \
-    sshpass \
-    python \
-    python-dev \
-    python-pip \
-    python-setuptools && \
-    easy_install -U setuptools
-
-RUN apt-get -y autoremove && \
-    apt-get clean
-
-RUN mkdir -p ${REPOS_DIR}
-
-RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
-RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
-
-RUN easy_install pytz
-RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 00000000..f5ac0e86
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+FROM ubuntu:14.04
+MAINTAINER MatthewLi <matthew.lijun@huawei.com>
+
+LABEL image=opnfv/bottlenecks
+
+# GIT repo directory
+ENV REPOS_DIR /home/opnfv
+
+# Bottlenecks repo
+ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
+ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
+ENV creds ${BOTTLENECKS_REPO_DIR}/config/openstack.creds
+
+#new test suite required packages can be added here
+RUN apt-get update && apt-get install -y \
+    libffi-dev \
+    libssl-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    curl \
+    wget \
+    git \
+    sshpass \
+    python \
+    python-dev \
+    python-pip \
+    python-setuptools && \
+    easy_install -U setuptools
+
+RUN apt-get -y autoremove && \
+    apt-get clean
+
+RUN mkdir -p ${REPOS_DIR}
+
+RUN git config --global http.sslVerify false
+RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
+RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+
+RUN easy_install pytz
+RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt
-- 
cgit 1.2.3-korg