Release 1.0.13

[ric-app/ts.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 1260ecd..3259306 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
 
 # the builder has: git, wget, cmake, gcc/g++, make, python2/3. v7 dropped nng support
 #
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as buildenv
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as buildenv
 
 # spaces to save things in the build image to copy to final image
 RUN mkdir -p /playpen/assets /playpen/src /playpen/bin
@@ -40,9 +40,9 @@ ARG SRC=.
 WORKDIR /playpen
 
 # versions we snarf from package cloud
-ARG RMR_VER=4.0.2
+ARG RMR_VER=4.0.5
 ARG SDL_VER=1.0.4
-ARG XFCPP_VER=1.0.0
+ARG XFCPP_VER=1.2.0
 
 # package cloud urls for wget
 ARG PC_REL_URL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch
@@ -65,6 +65,16 @@ RUN wget -nv --content-disposition ${PC_STG_URL}/sdl_${SDL_VER}-1_amd64.deb/down
        wget -nv --content-disposition ${PC_STG_URL}/sdl-dev_${SDL_VER}-1_amd64.deb/download.deb &&\
        dpkg -i sdl-dev_${SDL_VER}-1_amd64.deb sdl_${SDL_VER}-1_amd64.deb
 
+RUN git clone https://github.com/Tencent/rapidjson && \
+   cd rapidjson && \
+   mkdir build && \
+   cd build && \
+   cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+   make install && \
+   cd ${STAGE_DIR} && \
+   rm -rf rapidjson
+
+
 
 #
 # build and install the application(s)
@@ -86,12 +96,22 @@ COPY assets/bootstrap.rt /playpen/assets
 #
 
 
-
 # -----  create final, smaller, image ----------------------------------
 FROM ubuntu:18.04
 
-# if bash doesn't cut it for something, grab ksh, then clean up as much as possible
-#RUN apt-get update; apt-get install -y ksh
+# package cloud urls for wget
+ARG PC_REL_URL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch
+ARG PC_STG_URL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch
+ARG SDL_VER=1.0.4
+
+# sdl doesn't install into /usr/local like everybody else, and we don't want to
+# hunt for it or copy all of /usr, so we must pull and reinstall it.
+RUN apt-get update
+RUN apt-get install -y libboost-filesystem1.65.1 libboost-system1.65.1 libhiredis0.13 wget
+RUN wget -nv --content-disposition ${PC_STG_URL}/sdl_${SDL_VER}-1_amd64.deb/download.deb && \
+       wget -nv --content-disposition ${PC_STG_URL}/sdl-dev_${SDL_VER}-1_amd64.deb/download.deb &&\
+       dpkg -i sdl-dev_${SDL_VER}-1_amd64.deb sdl_${SDL_VER}-1_amd64.deb
+
 RUN rm -fr /var/lib/apt/lists
 
 # snarf the various sdl, rmr, and cpp-framework libraries as well as any binaries
@@ -99,7 +119,6 @@ RUN rm -fr /var/lib/apt/lists
 #
 COPY --from=buildenv /usr/local/lib /usr/local/lib/
 COPY --from=buildenv /usr/local/bin/rmr_probe /usr/local/bin/ts_xapp /usr/local/bin/
-COPY --from=buildenv /usr/lib /usr/lib/
 COPY --from=buildenv /playpen/bin /usr/local/bin/
 COPY --from=buildenv /playpen/assets /data
 
@@ -107,14 +126,13 @@ COPY --from=buildenv /playpen/assets /data
 ENV PATH=/usr/local/bin:$PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
 
-#ENV RMR_SEED_RT="routes.txt"
-
 WORKDIR /data
 COPY --from=buildenv /playpen/assets/* /data
 
 # if needed, set RMR vars
 ENV RMR_SEED_RT=/data/bootstrap.rt
 #ENV RMR_RTG_SVC=rm-host:port
+ENV RMR_SRC_ID=service-ricxapp-trafficxapp-rmr.ricxapp:4560
 ENV RMR_VCTL_FILE=/tmp/rmr.v
 RUN echo "2" >/tmp/rmr.v