From 4e0a60741c8a6e0387ec3d18fcf0b41def8fcb86 Mon Sep 17 00:00:00 2001
From: Moshe <moshehoa@amdocs.com>
Date: Thu, 29 Mar 2018 09:14:00 +0300
Subject: Fix docker image creation during maven build

Issue-ID: VNFSDK-183
Change-Id: I6224bae4ae472c6029156dea659a89dc992d1f76
Signed-off-by: Moshe <moshehoa@amdocs.com>
---
 docker/Dockerfile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'docker/Dockerfile')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 20598c7..62095ca 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@
 # yardstick/docker/Dockerfile
 FROM ubuntu:16.04
 
-LABEL image=onap/vnftest
+LABEL image=onap/vnfsdk/vnftest
 
 ARG BRANCH=master
 
@@ -41,11 +41,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.onap.org/r/vnfsdk/dovetail-int
 
 WORKDIR ${VNFTEST_REPO_DIR}
 RUN ${VNFTEST_REPO_DIR}/install.sh
-RUN ${VNFTEST_REPO_DIR}/docker/supervisor.sh
-
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-
-EXPOSE 6000
 
 ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
 ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}
@@ -54,6 +49,3 @@ COPY ./exec_tests.sh /usr/local/bin/
 
 ENV NSB_DIR="/opt/nsb_bin" \
     PYTHONPATH="${PYTHONPATH}:${NSB_DIR}/trex_client:${NSB_DIR}/trex_client/stl"
-
-WORKDIR ${REPOS_DIR}
-CMD ["/usr/bin/supervisord"]
-- 
cgit 1.2.3-korg