X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=95515ec2ef03567827cad21cb23169b72d0125b0;hb=81b40a09efd3580a6fb55271ed863e7304be8e20;hp=3bf5fb3d2d16bc9bc96f820eb838a91dabf29508;hpb=5311973b3bd700aa661d3f44607960919b387462;p=osm%2Fdevops.git diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index 3bf5fb3d..95515ec2 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -1,6 +1,8 @@ ## # Copyright 2019 ETSI # +# All Rights Reserved. +# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -14,7 +16,6 @@ # under the License. ## -######################################################################## FROM ubuntu:16.04 @@ -24,8 +25,10 @@ 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 + python-openstackclient wget python3-pip + RUN pip install -U pip && python -m pip install python-magic pyangbind pytest==4.6.3 +RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian ARG RELEASE=ReleaseFOUR-daily @@ -39,8 +42,8 @@ ARG OSMCLIENT_VERSION ARG DEVOPS_VERSION ARG IM_VERSION -RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osmclient${OSMCLIENT_VERSION} python-osm-im${IM_VERSION} - +RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osm-im${IM_VERSION} +RUN apt-get -y install python3-osm-im${IM_VERSION} python3-osmclient${OSMCLIENT_VERSION} ENV OSM_SOL005=True ENV OSM_HOSTNAME=nbi:9999 ENV OSM_RO_HOSTNAME=ro:9090