X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile-local;h=7f1bf01c80e444ecce0baae734a2c2b909acd64c;hb=d44a9ff57fe5f298122e90a3a7d342f86c770a97;hp=f68b3798e1d9b0789b930d68f11ccd708a109a09;hpb=a6eff0a68fb60108545b81215f9551097f4bfd40;p=osm%2FRO.git diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index f68b3798..7f1bf01c 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -8,11 +8,11 @@ COPY docker/scripts/ /bin/RO RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ - apt-get update && \ DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \ + apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ - DEBIAN_FRONTEND=noninteractive pip install -U pip && \ + DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \ DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \ DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ @@ -21,10 +21,12 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \ + DEBIAN_FRONTEND=noninteractive pip install untangle && \ + DEBIAN_FRONTEND=noninteractive pip install -e git+https://github.com/python-oca/python-oca#egg=oca && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-bitarray && \ DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client && \ mkdir -p /root/RO && \ - make -C /root/RO clean all BRANCH=master && \ + make -C /root/RO clean all BRANCH=v4.0 && \ dpkg -i /root/RO/IM/deb_dist/python-pyang_*.deb && \ dpkg -i /root/RO/IM/deb_dist/python-pyangbind_*.deb && \ dpkg -i /root/RO/IM/deb_dist/python-osm-im*.deb && \