X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=7cee0fe4da58791d27a6dcf9ecc8c74a7f412fad;hb=488447aed60cc52b06d71d50bee4ecf10025f7e1;hp=7760f5667c686224b2ea0093a00d1837343f5622;hpb=dad910695faf755da932bdbd07430f58718fd910;p=ric-plt%2Fxapp-frame-cpp.git diff --git a/Dockerfile b/Dockerfile index 7760f56..7cee0fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ # -------------------------------------------------------------------------------------- -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as buildenv +FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.0.0 as buildenv RUN mkdir /playpen RUN apt-get update && apt-get install -y cmake gcc make git g++ wget @@ -58,16 +58,14 @@ ARG RMR_VER=4.8.0 COPY ${SRC}/build_rmr.sh /playpen/bin RUN bash /playpen/bin/build_rmr.sh -t ${RMR_VER} -COPY ${SRC}/CMakeLists.txt /playpen/factory/ -COPY ${SRC}/src /playpen/factory/src/ -COPY ${SRC}/test /playpen/factory/test/ + +#copy the content as git repo inside the container. +#COPY ${SRC}/CMakeLists.txt /playpen/factory/ +#COPY ${SRC}/src /playpen/factory/src/ +#COPY ${SRC}/test /playpen/factory/test/ COPY ${SRC}/examples /tmp/examples/ +COPY . /playpen/factory -# -# Run unit tests -# -COPY ${SRC}/test/* /playpen/factory/test/ -RUN cd /playpen/factory/test; bash unit_test.sh # Go to the factory and build our stuff # @@ -76,8 +74,17 @@ ENV C_INCLUDE_PATH=/usr/local/include RUN cd /playpen/factory; rm -fr .build; mkdir .build; cd .build; cmake .. -DDEV_PKG=1; make install; cmake .. -DDEV_PKG=0; make install + + +# +# Run unit tests will come after building process +# +COPY ${SRC}/test/* /playpen/factory/test/ +RUN cd /playpen/factory/test; bash unit_test.sh + + # ----- final, smaller image ---------------------------------- -FROM ubuntu:18.04 +FROM ubuntu:20.04 # must add compile tools to make it a builder environmnent. If a build environment isn't needed # comment out the next line and reduce the image size by more than 180M.