NFVBENCH-17 Create docker container using OPNFV releng scripts 73/40873/3
authorKerim Gokarslan <kgokarsl@cisco.com>
Fri, 1 Sep 2017 18:20:07 +0000 (11:20 -0700)
committerKerim Gokarslan <kgokarsl@cisco.com>
Fri, 1 Sep 2017 20:50:26 +0000 (13:50 -0700)
Change-Id: Ic6f06cd731e28b99ad50037251ee35e0207b2bff
Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
docker/Dockerfile [moved from Dockerfile with 93% similarity]
docker/nfvbench-entrypoint.sh [new file with mode: 0755]

similarity index 93%
rename from Dockerfile
rename to docker/Dockerfile
index 2c8a361..1f61eab 100644 (file)
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \
        vim \
        wget \
        net-tools \
+       && mkdir /tmp/http_root \
        && mkdir -p /opt/trex \
        && wget --no-cache https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \
        && tar xzf $TREX_VER.tar.gz -C /opt/trex \
@@ -32,4 +33,5 @@ RUN apt-get update && apt-get install -y \
 
 ENV TREX_STL_EXT_PATH "/opt/trex/$TREX_VER/external_libs"
 
-CMD ["tail", "-f", "/dev/null"]
+ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]
+
diff --git a/docker/nfvbench-entrypoint.sh b/docker/nfvbench-entrypoint.sh
new file mode 100755 (executable)
index 0000000..64f9ade
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright 2017 Cisco Systems, Inc.  All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+
+#!/bin/bash
+if [ -z "$1" ] ||  [ $1 != 'start_rest_server' ];then
+       tail -f /dev/null
+else
+        nfvbench --server /tmp/http_root --host 127.0.0.1 --port 7556
+fi