hs-test: fix install/build on new ubuntu instance

Type: test

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I9c59d98d16e387925057626ba9080210f4334c53

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index f9c111e..c4eadab 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -1,7 +1,7 @@
 all: build docker
 
 install-dep:
-       apt update -y && apt install -y apache2-utils wrk
+       apt update -y && apt install -y golang docker-ce apache2-utils wrk bridge-utils
 
 build:
        go build ./tools/http_server

diff --git a/extras/hs-test/docker/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx
index 930151f..56c6220 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.nginx
+++ b/extras/hs-test/docker/Dockerfile.nginx
@@ -2,9 +2,9 @@ ARG UBUNTU_VERSION
 
 FROM ubuntu:${UBUNTU_VERSION}
 
-RUN apt-get update
-RUN apt-get install -y nginx
-RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+ && apt-get install -y nginx \
+ && rm -rf /var/lib/apt/lists/*
 
 COPY vpp-data/lib/* /usr/lib/
 COPY resources/nginx/vcl.conf /vcl.conf