aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2023-03-08 13:53:32 -0500
committerDave Wallace <dwallacelf@gmail.com>2023-03-08 13:53:32 -0500
commitf72bb6fb242daea784ccefe6d086adeb73e3b859 (patch)
treef66fecf316762e6a14eb9fcc35a14f615829e447
parent51cb655b75ba3e065e2f6b28d313203e10db0ed2 (diff)
hs-test: fix install-deps
- Skip addition of docker apt source/key if already installed. Type: fix Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I747e4dd5e79e23b64e6eb11c6a9348e2ae1a157f
-rw-r--r--extras/hs-test/Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index eb2461dfc67..c7fdc4ea65a 100644
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -82,12 +82,16 @@ build-debug: .deps.ok build-vpp-debug build-go
.PHONY: install-deps
install-deps:
@rm -f .deps.ok
- @apt update -y \
- && apt install -y apt-transport-https ca-certificates curl software-properties-common \
- && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
- && echo "deb [arch=$(ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(UBUNTU_CODENAME) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
- && apt update \
- && apt install -y golang docker-ce apache2-utils wrk bridge-utils
+ @apt-get update \
+ && apt-get install -y apt-transport-https ca-certificates curl software-properties-common \
+ && apt-get install -y golang apache2-utils wrk bridge-utils
+ @if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ] ; then \
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg; \
+ echo "deb [arch=$(ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(UBUNTU_CODENAME) stable" \
+ | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ; \
+ apt-get update; \
+ fi
+ @apt-get install -y docker-ce
@touch .deps.ok
.PHONY: fixstyle