Phase 2 of image generation prep
This change:
- deletes some of the unnecessary framework
files which were imported at repo create time.
- adds docs for RTD
- Adds CMake files to build (easier for CI)
- Tweaks the docker file to build using cmake
Issue-ID: RIC-349
Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I94202642764d4b4c0c3555a37dc8b36f4c009f3f
diff --git a/Dockerfile b/Dockerfile
index 1e29e25..1260ecd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,10 +29,9 @@
# Author: E. Scott Daniels
# --------------------------------------------------------------------------------------
-# nexus seems to use ports rather than adding release, prod, staging to the url :(
# the builder has: git, wget, cmake, gcc/g++, make, python2/3. v7 dropped nng support
#
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as buildenv
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-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
@@ -68,11 +67,15 @@
#
-# build and install the application
+# build and install the application(s)
#
-COPY examples/* /playpen/src/
-RUN cd /playpen/src && make && make install
-
+COPY . /playpen/src/
+RUN cd /playpen/src && \
+ rm -fr .build &&\
+ mkdir .build && \
+ cd .build && \
+ cmake .. && \
+ make install
# non-programme things that we need to push to final image
#
@@ -110,9 +113,9 @@
COPY --from=buildenv /playpen/assets/* /data
# if needed, set RMR vars
-#ENV RMR_RTG_SVC=rm-host:port
-#ENV RMR_VCTL_FILE=/tmp/rmr.v
ENV RMR_SEED_RT=/data/bootstrap.rt
+#ENV RMR_RTG_SVC=rm-host:port
+ENV RMR_VCTL_FILE=/tmp/rmr.v
+RUN echo "2" >/tmp/rmr.v
-#CMD [ "ts_xapp_start.sh" ]
CMD [ "/usr/local/bin/ts_xapp" ]