From e31371a64adffa3b33cea167385e6daf0bc3b0a5 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Fri, 21 Sep 2018 16:56:54 -0400 Subject: [PATCH] Update osmclient docker to use versioned osm-devops Change-Id: If07d3f29b94b925fb41aaf0d0321b2c8c7c9f007 Signed-off-by: Mike Marchetti --- docker/mk/Makefile.include | 1 + docker/osmclient/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index a1242341..81529f34 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -43,6 +43,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg OSMCLIENT_VERSION==$(shell cat $(MKBUILD)/.dep_osmclient) \ --build-arg NBI_VERSION==$(shell cat $(MKBUILD)/.dep_NBI) \ --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_POL) \ + --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ $(DOCKER_ARGS) . clean: diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index b8e76863..d544a6ee 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -5,7 +5,8 @@ LABEL authors="Michael Marchetti" RUN apt-get update && apt-get -y install curl software-properties-common RUN apt-get update && apt-get -y install python \ - libcurl4-gnutls-dev libgnutls-dev iputils-ping python-pip + libcurl4-gnutls-dev libgnutls-dev iputils-ping python-pip \ + python-openstackclient wget RUN pip install python-magic pytest ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -- 2.25.1