Code Review
/
ric-app
/
mc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Support for additional NR metrics
[ric-app/mc.git]
/
mc-core
/
Dockerfile
diff --git
a/mc-core/Dockerfile
b/mc-core/Dockerfile
index
d2fbbb0
..
70c178e
100644
(file)
--- a/
mc-core/Dockerfile
+++ b/
mc-core/Dockerfile
@@
-16,19
+16,24
@@
ARG STAGE_DIR=/mc
ARG STAGE_DIR=/mc
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng AS project-build
-# Update & installation of linux packages
-RUN apt-get update -y && \
- apt-get install -y curl && \
- apt-get install -y procps && \
- apt-get install -y python-pip
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 AS project-build
ARG STAGE_DIR
ARG STAGE_DIR
+ARG RMR_VER=3.7.4
+
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
+RUN dpkg -i rmr_${RMR_VER}_amd64.deb
+RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
+RUN ldconfig
+
COPY mc ${STAGE_DIR}
WORKDIR ${STAGE_DIR}
COPY mc ${STAGE_DIR}
WORKDIR ${STAGE_DIR}
-RUN apt-get install -y libboost-all-dev
-RUN apt-get install -y libhiredis-dev
+RUN apt-get update && \
+ apt-get install -y libboost-all-dev && \
+ apt-get install -y libhiredis-dev && \
+ apt-get clean
RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/sdl
WORKDIR ${STAGE_DIR}/sdl
RUN ./autogen.sh
RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/sdl
WORKDIR ${STAGE_DIR}/sdl
RUN ./autogen.sh
@@
-53,11
+58,12
@@
RUN ./configure
RUN make
RUN make install
RUN ldconfig
RUN make
RUN make install
RUN ldconfig
-RUN pip install protobuf
WORKDIR ${STAGE_DIR}
WORKDIR ${STAGE_DIR}
-RUN git clone -b release/0.
1
.0 https://gerrit.o-ran-sc.org/r/com/gs-lite
+RUN git clone -b release/0.
2
.0 https://gerrit.o-ran-sc.org/r/com/gs-lite
WORKDIR ${STAGE_DIR}/gs-lite
WORKDIR ${STAGE_DIR}/gs-lite
-COPY mc/cfg ${STAGE_DIR}/gs-lite/cfg
+COPY mc/cfg/packet_schema.txt ${STAGE_DIR}/gs-lite/cfg/
+COPY mc/cfg/ifres.xml ${STAGE_DIR}/gs-lite/cfg/
+COPY mc/cfg/localhost.ifq ${STAGE_DIR}/gs-lite/cfg/
COPY mc/local_datasource ${STAGE_DIR}/gs-lite/src/lib/gscprts/local_datasource
COPY mc/local ${STAGE_DIR}/gs-lite/include/lfta/local
COPY mc/queries ${STAGE_DIR}/gs-lite/demo/queries
COPY mc/local_datasource ${STAGE_DIR}/gs-lite/src/lib/gscprts/local_datasource
COPY mc/local ${STAGE_DIR}/gs-lite/include/lfta/local
COPY mc/queries ${STAGE_DIR}/gs-lite/demo/queries
@@
-70,7
+76,7
@@
RUN python generate_runall.py
# now install the binaries and libraries into smaller docker image
# now install the binaries and libraries into smaller docker image
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/ric-app-mc-listener:1.
4
.0
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/ric-app-mc-listener:1.
5
.0
ARG STAGE_DIR
ARG STAGE_DIR
@@
-78,6
+84,7
@@
COPY --from=project-build ${STAGE_DIR}/gs-lite/demo/queries /mc/gs-lite/demo/que
COPY --from=project-build ${STAGE_DIR}/gs-lite/bin /mc/gs-lite/bin
COPY --from=project-build ${STAGE_DIR}/data_gen /mc/data_gen
COPY --from=project-build ${STAGE_DIR}/extract_params.py /mc/
COPY --from=project-build ${STAGE_DIR}/gs-lite/bin /mc/gs-lite/bin
COPY --from=project-build ${STAGE_DIR}/data_gen /mc/data_gen
COPY --from=project-build ${STAGE_DIR}/extract_params.py /mc/
+COPY --from=project-build ${STAGE_DIR}/extract_rmr_port.py /mc/
COPY --from=project-build /usr/local/lib/libproto* /usr/local/lib/
COPY --from=project-build /usr/local/lib/libsdl* /usr/local/lib/
COPY --from=project-build /usr/local/lib/libproto* /usr/local/lib/
COPY --from=project-build /usr/local/lib/libsdl* /usr/local/lib/
@@
-87,8
+94,7
@@
COPY --from=project-build ${STAGE_DIR}/mc_deployment.json /opt/ric/config/config
COPY container_start.sh /playpen/bin/
RUN apt-get update && \
COPY container_start.sh /playpen/bin/
RUN apt-get update && \
- apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev \
- redis-tools && \
+ apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev && \
apt-get clean
RUN ldconfig
apt-get clean
RUN ldconfig