From: Shuky Har-Noy <shuky.har-noy@intl.att.com>
Date: Tue, 17 Mar 2020 17:17:50 +0000 (+0000)
Subject: Merge "Adjust build script for portability"
X-Git-Tag: R5_RC~122
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git

Merge "Adjust build script for portability"
---

a75da9a56d61ca4754650d44a54bbf0b04f610d1
diff --cc E2Manager/Dockerfile
index 6a95812,5f80d82..1352405
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@@ -41,11 -42,11 +42,11 @@@ COPY --from=ubuntu /opt/E2Manager/route
  COPY --from=ubuntu /opt/E2Manager/main /opt/E2Manager/main
  COPY --from=ubuntu /opt/E2Manager/resources/configuration.yaml /opt/E2Manager/resources/configuration.yaml
  COPY --from=ubuntu /opt/E2Manager/resources/rmr.verbose /tmp/rmr.verbose
 -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.1 /usr/local/lib/librmr_nng.so.1
 -COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1
 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.3 /usr/local/lib/librmr_si.so.3
 +
  WORKDIR /opt/E2Manager
  ENV LD_LIBRARY_PATH=/usr/local/lib \
-     port=3800 
+     port=3800
  ENV RMR_SEED_RT=router.txt
  ENV RMR_VCTL_FILE=/tmp/rmr.verbose
  EXPOSE 3800
diff --cc E2Manager/build-e2mgr-ubuntu.sh
index ae1794d,d298f57..e623ab8
--- a/E2Manager/build-e2mgr-ubuntu.sh
+++ b/E2Manager/build-e2mgr-ubuntu.sh
@@@ -35,27 -30,14 +30,14 @@@ set -eu
  
  echo "--> e2mgr-build-ubuntu.sh"
  
- # Build and install NNG, which requires ninja
- apt-get install ninja-build
- git clone https://github.com/nanomsg/nng.git \
-     && cd nng \
-     && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
-     && mkdir build \
-     && cd build \
-     && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
-     && ninja \
-     && ninja install \
-     && cd ../.. \
-     && rm -r nng
- 
  # Install RMR from deb packages at packagecloud.io
 -rmr=rmr_1.13.0_amd64.deb
 +rmr=rmr_3.5.1_amd64.deb
  wget --content-disposition  https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmr/download.deb
- dpkg -i $rmr
+ sudo dpkg -i $rmr
  rm $rmr
 -rmrdev=rmr-dev_1.13.0_amd64.deb
 +rmrdev=rmr-dev_3.5.1_amd64.deb
  wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmrdev/download.deb
- dpkg -i $rmrdev
+ sudo dpkg -i $rmrdev
  rm $rmrdev
  
  # required to find nng and rmr libs