X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=ab1a8ac61f8902cb73277424de39a1c5c1ee9d63;hb=a4a37f7f9f5410ff2c7833b76bdc85f752c74849;hp=3bf5fb3d2d16bc9bc96f820eb838a91dabf29508;hpb=d3dd343665385d6f6ce7d0b37950857b87b5bc09;p=osm%2Fdevops.git diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index 3bf5fb3d..ab1a8ac6 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,33 +16,32 @@ # under the License. ## -######################################################################## -FROM ubuntu:16.04 +FROM ubuntu:18.04 -LABEL authors="Michael Marchetti" +MAINTAINER Gerardo Garcia ; Jayant Madavi 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 -U pip && python -m pip install python-magic pyangbind pytest==4.6.3 +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install wget python3 python3-pip \ + libcurl4-openssl-dev libssl-dev python3-openstackclient + +RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3 verboselogs ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg 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 IM" && apt update +RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} devops osmclient IM" && apt-get update 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} \ + python3-osm-im${IM_VERSION} python3-osmclient${OSMCLIENT_VERSION} ENV OSM_SOL005=True ENV OSM_HOSTNAME=nbi:9999 -ENV OSM_RO_HOSTNAME=ro:9090 +