X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=d544a6ee6f16c0266537aa46b55a9d7368452382;hb=046b6665632fafbd4a62d116f92fbd2344580128;hp=a2cd547508c6741974a137ec6ed4f4306d981f1b;hpb=b84208591169bb31951cdb0c43e24322c2e76fc0;p=osm%2Fdevops.git

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index a2cd5475..d544a6ee 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -4,6 +4,11 @@ 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 \
+    python-openstackclient wget
+RUN pip install python-magic pytest
+
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseFOUR-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
@@ -12,9 +17,10 @@ ARG REPOSITORY=testing
 RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
 RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} devops osmclient" && apt update
 
-RUN apt-get update && apt-get -y install python \
-    libcurl4-gnutls-dev libgnutls-dev osm-devops python-osmclient iputils-ping python-pip
-RUN pip install python-magic pytest
+ARG OSMCLIENT_VERSION
+ARG DEVOPS_VERSION
+
+RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osmclient${OSMCLIENT_VERSION}
 
 ENV OSM_SOL005=True
 ENV OSM_HOSTNAME=nbi:9999