X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=84b83831cb3179034df65b748368625bceb359c3;hb=2ba58cd78e409ae234aac627914f954e6aa8b1ff;hp=dbd558df48ed3bebab8c0e1f6641ecac255a5fb6;hpb=5cc86eb25cc33a2cc1472325cffc5634a6c203c6;p=o-du%2Fl2.git

diff --git a/Dockerfile b/Dockerfile
index dbd558df4..84b83831c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,6 @@
 FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0
 
 # ======================================================================
-# add netconf user
-RUN \
-      adduser --system netconf && \
-      echo "netconf:netconf" | chpasswd
-
-# generate ssh keys for netconf user
-RUN \
-      mkdir -p /home/netconf/.ssh && \
-      ssh-keygen -A && \
-      ssh-keygen -t dsa -P '' -f /home/netconf/.ssh/id_dsa && \
-      cat /home/netconf/.ssh/id_dsa.pub > /home/netconf/.ssh/authorized_keys
-
 
 ADD . /opt/o-du-l2
 WORKDIR /opt/o-du-l2
@@ -24,10 +12,13 @@ RUN cd build/odu && make clean_odu odu MACHINE=BIT64 MODE=FDD
 RUN cd build/odu && make clean_odu odu MACHINE=BIT64 MODE=TDD
 #CMD /opt/o-du-l2/bin/odu/odu
 
+# add netconf user
+RUN cd build/scripts && /bin/bash add_netconf_user.sh
+
 #cleanup netconf folder and install libraries
-RUN cd build/o1  && rm -rf netconf && /bin/bash install_lib.sh -c
+RUN cd build/scripts && /bin/bash install_lib_O1.sh -c
 
-RUN cd build/o1  && make o1 MACHINE=BIT64
+# Install yang models and load initial configuration
+RUN cd build/scripts && /bin/bash load_yang.sh
 
-# Install the data models based on the ODU yang model
-RUN /usr/local/bin/sysrepoctl -i build/o1/yang/o-ran-sc-odu-alarm-v1.yang
+RUN cd build/odu && make clean_odu odu MACHINE=BIT64 MODE=FDD O1_ENABLE=YES