From 4d34ece8ec2ca38738904ada9795a1654fd834d9 Mon Sep 17 00:00:00 2001 From: tierno Date: Mon, 29 Oct 2018 10:16:01 +0000 Subject: [PATCH 1/1] Fixing dockerfile local for osm_im import Change-Id: I74015a2f53f03e56c959d73ec2d5e4c580a40779 Signed-off-by: tierno --- Dockerfile.local | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index c76bc90..da13878 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -3,10 +3,10 @@ FROM ubuntu:16.04 # Set the working directory to /app -WORKDIR /app/osm_nbi +WORKDIR /app/NBI/osm_nbi # Copy the current directory contents into the container at /app -ADD . /app +ADD . /app/NBI RUN apt-get update && apt-get install -y git python3 python3-jsonschema \ python3-pymongo python3-yaml python3-pip python3-keystoneclient \ @@ -23,12 +23,14 @@ RUN git clone https://osm.etsi.org/gerrit/osm/common.git \ # OSM_IM RUN pip3 install pyang && mkdir -p /app && cd /app \ - && git clone https://github.com/robshakir/pyangbind \ - && pip3 install -e pyangbind \ - && git clone https://osm.etsi.org/gerrit/osm/IM \ + && git -C /app clone https://github.com/robshakir/pyangbind \ + && pip3 install -e /app/pyangbind \ + && git -C /app clone https://osm.etsi.org/gerrit/osm/IM \ && cd /app/IM/models/yang \ - && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/vnfd_catalog.py vnfd.yang \ - && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/nsd_catalog.py nsd.yang + && mkdir /app/IM/osm_im \ + && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/vnfd.py vnfd.yang \ + && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/IM/osm_im/nsd.py nsd.yang \ + && pip3 install -e /app/IM EXPOSE 9999 -- 2.17.1