diff options
| -rw-r--r-- | docker/Dockerfile (renamed from Dockerfile) | 4 | ||||
| -rwxr-xr-x | docker/nfvbench-entrypoint.sh | 21 |
2 files changed, 24 insertions, 1 deletions
diff --git a/Dockerfile b/docker/Dockerfile index 2c8a361..1f61eab 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -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 index 0000000..64f9ade --- /dev/null +++ b/docker/nfvbench-entrypoint.sh @@ -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 |