aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-09-29 17:37:15 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2016-09-29 17:37:45 +0200
commit7a99ea3daf7e01936612e1c205ec612a92732ed9 (patch)
treeaaa1281795d53a9e11a4b94133e36053456461a3
parent1f389fa4e814bda23fcb650a737ef2bff13aacf8 (diff)
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: I6fc236688389879fd7f62788eaf77d75dc4730cd Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--Dockerfile50
-rw-r--r--docker/Dockerfile (renamed from tests/ci/docker/yardstick-ci/Dockerfile)0
-rw-r--r--docker/Makefile (renamed from tests/ci/docker/Makefile)0
-rwxr-xr-xdocker/exec_tests.sh (renamed from tests/ci/docker/yardstick-ci/exec_tests.sh)0
4 files changed, 0 insertions, 50 deletions
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 59dbef0ba..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB 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 Hans Feldt <hans.feldt@ericsson.com>
-
-# TODO: Is there some easy way to get the fastest/closest mirror?
-#RUN sed -i 's/archive.ubuntu.com/ftp.acc.umu.se/g' /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y \
- libffi-dev \
- libssl-dev \
- libxml2-dev \
- libxslt1-dev \
- python \
- python-dev \
- python-setuptools && \
- easy_install -U setuptools
-
-COPY . /tmp/yardstick
-
-RUN cd /tmp/yardstick && \
- python setup.py install && \
- apt-get -y remove \
- binutils \
- cpp \
- gcc \
- libffi-dev \
- libssl-dev \
- python3 \
- python-dev && \
- apt-get -y autoremove && \
- apt-get clean && \
- useradd -u 65500 -m yardstick && \
- cp -a samples /home/yardstick && \
- chown -R yardstick /home/yardstick/samples && \
- chgrp -R yardstick /home/yardstick/samples && \
- rm -rf /tmp/* && \
- rm -rf /var/lib/apt/lists/*
-
-USER yardstick
-CMD bash --login
-ENV HOME /home/yardstick
-WORKDIR /home/yardstick
diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/docker/Dockerfile
index 5387babff..5387babff 100644
--- a/tests/ci/docker/yardstick-ci/Dockerfile
+++ b/docker/Dockerfile
diff --git a/tests/ci/docker/Makefile b/docker/Makefile
index 036d67db3..036d67db3 100644
--- a/tests/ci/docker/Makefile
+++ b/docker/Makefile
diff --git a/tests/ci/docker/yardstick-ci/exec_tests.sh b/docker/exec_tests.sh
index 9aee240da..9aee240da 100755
--- a/tests/ci/docker/yardstick-ci/exec_tests.sh
+++ b/docker/exec_tests.sh