X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2FDockerfile;h=172615873067bd18a1d0c91d4482a11398244448;hb=refs%2Fchanges%2F58%2F2758%2F1;hp=4f9561b41c98090144bbdd1c6b679686cec07545;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile index 4f9561b..1726158 100644 --- a/E2Manager/Dockerfile +++ b/E2Manager/Dockerfile @@ -27,10 +27,10 @@ COPY . . ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin #RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr && cd rmr/; mkdir build; cd build; /opt/bin/cmake -DDEV_PKG=1 ..; make install # Install RMr library and dev files -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.13.0_amd64.deb/download.deb -RUN dpkg -i rmr_1.13.0_amd64.deb -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.13.0_amd64.deb/download.deb -RUN dpkg -i rmr-dev_1.13.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_3.3.0_amd64.deb/download.deb +RUN dpkg -i rmr_3.3.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.3.0_amd64.deb/download.deb +RUN dpkg -i rmr-dev_3.3.0_amd64.deb RUN cd 3rdparty/asn1codec && make RUN go build app/main.go @@ -58,12 +58,14 @@ RUN apt-get update && apt-get install -y \ COPY --from=ubuntu /opt/E2Manager/router.txt /opt/E2Manager/router.txt COPY --from=ubuntu /opt/E2Manager/main /opt/E2Manager/main -COPY --from=ubuntu /opt/E2Manager/resources /opt/E2Manager/resources +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 WORKDIR /opt/E2Manager ENV LD_LIBRARY_PATH=/usr/local/lib \ port=3800 ENV RMR_SEED_RT=router.txt +ENV RMR_VCTL_FILE=/tmp/rmr.verbose EXPOSE 3800 CMD ["sh", "-c", "./main -port=$port"]