diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2023-02-22 13:56:06 -0500 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2023-02-22 16:12:37 -0500 |
commit | 67dbc4aa80f54dcf6621e3edf440f1482866ff8a (patch) | |
tree | d4c3bd3ea22b84c21734e4ae6df87cc687cd56ea /extras | |
parent | 300f70d3a3b09ed5d9371cb2936e72e1c01d042a (diff) |
hs-test: fix install/build on new ubuntu instance
Type: test
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I9c59d98d16e387925057626ba9080210f4334c53
Diffstat (limited to 'extras')
-rw-r--r-- | extras/hs-test/Makefile | 2 | ||||
-rw-r--r-- | extras/hs-test/docker/Dockerfile.nginx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index f9c111eed56..c4eadabf869 100644 --- 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 930151fefef..56c6220b5ec 100644 --- 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 |