From 634764bdb133f65515088be91f3a5049d6eb027e Mon Sep 17 00:00:00 2001
From: ahothan <ahothan@cisco.com>
Date: Sun, 17 Mar 2019 22:34:25 -0700
Subject: NFVBENCH-126 Remove socketio support (debt reduction)

Allow REST server to start in no-openstack mode
Fix pbr version (was set to 0.0.0)
Add docker-compose support
Update documentation for REST API

Change-Id: Ib520b09283ba6a878f802365292a7a829e6ccd09
Signed-off-by: ahothan <ahothan@cisco.com>
---
 docker/Dockerfile             | 12 ++++++++----
 docker/nfvbench-entrypoint.sh |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1980575..f46e3d0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,6 +4,9 @@ FROM ubuntu:16.04
 ENV TREX_VER "v2.53"
 ENV VM_IMAGE_VER "0.6"
 
+# Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
+# from the git tag
+
 RUN apt-get update && apt-get install -y \
        git \
        kmod \
@@ -14,7 +17,6 @@ RUN apt-get update && apt-get install -y \
        wget \
        net-tools \
        libelf1 \
-       && mkdir /tmp/http_root \
        && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
        && wget --no-cache https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \
@@ -24,11 +26,13 @@ RUN apt-get update && apt-get install -y \
        && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python2.7/dist-packages/ \
        && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
-       && pip install -U pip pbr \
-       && hash -r pip \
+       && apt-get remove -y python-pip \
+       && wget https://bootstrap.pypa.io/get-pip.py \
+       && python get-pip.py \
+       && pip install -U pbr \
        && pip install -U setuptools \
        && cd / \
-       && git clone --depth 1 https://gerrit.opnfv.org/gerrit/nfvbench \
+       && git clone https://gerrit.opnfv.org/gerrit/nfvbench \
        && cd /nfvbench && pip install -e . \
        && wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
        && python ./docker/cleanup_generators.py \
diff --git a/docker/nfvbench-entrypoint.sh b/docker/nfvbench-entrypoint.sh
index ed98ced..a7195a3 100755
--- a/docker/nfvbench-entrypoint.sh
+++ b/docker/nfvbench-entrypoint.sh
@@ -17,7 +17,7 @@
 if [ -z "$1" ] ||  [ $1 != 'start_rest_server' ]; then
         tail -f /dev/null
 else
-        PARAMS="--server /tmp/http_root"
+        PARAMS="--server"
         if [ -n "$HOST" ]; then
                 PARAMS+=" --host $HOST"
         fi
-- 
cgit 1.2.3-korg