projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable stage3 in branch WIM
[osm/devops.git]
/
docker
/
osmclient
/
Dockerfile
diff --git
a/docker/osmclient/Dockerfile
b/docker/osmclient/Dockerfile
index
a2cd547
..
d544a6e
100644
(file)
--- 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 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
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 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
ENV OSM_SOL005=True
ENV OSM_HOSTNAME=nbi:9999