X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2sim%2Fe2sm_examples%2Fkpm_e2sm%2FDockerfile;h=97353530f2f1495177747ea657cc1e0b53538673;hb=88de94233a1b3b09cc91e3b557c825ac1a80dacb;hp=6b16671028f7b3d02260e6f9997f4c18d73d1677;hpb=a9733dbcc47e93a3b2843056f1d587196296c324;p=sim%2Fe2-interface.git

diff --git a/e2sim/e2sm_examples/kpm_e2sm/Dockerfile b/e2sim/e2sm_examples/kpm_e2sm/Dockerfile
index 6b16671..9735353 100644
--- a/e2sim/e2sm_examples/kpm_e2sm/Dockerfile
+++ b/e2sim/e2sm_examples/kpm_e2sm/Dockerfile
@@ -31,7 +31,8 @@
 
 # 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
+ARG CONTAINER_PULL_REGISTRY=nexus3.o-ran-sc.org:10001
+FROM ${CONTAINER_PULL_REGISTRY}/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as buildenv
 
 # spaces to save things in the build image to copy to final image
 RUN mkdir -p /playpen/assets /playpen/src /playpen/bin
@@ -43,8 +44,8 @@ WORKDIR /playpen
 ARG E2SIM_VER=1.0.0
 
 # 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 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
 
 
 # snarf up E2SIM dependencies, then pull E2SIM package and install
@@ -73,24 +74,27 @@ RUN apt-get update \
   && apt-get clean
 
 
-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 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
 
 #
 # build and install the application(s)
 #
 
 
-#COPY e2sim_1.0.0_amd64.deb /playpen
-#COPY e2sim-dev_1.0.0_amd64.deb /playpen
+COPY e2sim_1.0.0_amd64.deb /playpen
+COPY e2sim-dev_1.0.0_amd64.deb /playpen
 
 RUN dpkg -i e2sim_1.0.0_amd64.deb e2sim-dev_1.0.0_amd64.deb
 
+
 RUN mkdir /usr/local/include/nlohmann
-COPY nlohmann_json_release/json.hpp /usr/local/include/nlohmann
+RUN git clone https://github.com/azadkuh/nlohmann_json_release.git
+RUN cp nlohmann_json_release/json.hpp /usr/local/include/nlohmann
 
 COPY . /playpen/src/
+RUN wc -l /playpen/src/reports.json
 RUN cd /playpen/src && \
 	rm -fr .build &&\
 	mkdir  .build && \
@@ -99,4 +103,4 @@ RUN cd /playpen/src && \
 	make install
 
 
-CMD [ "/usr/local/bin/ts_xapp" ]
+CMD kpm_sim 10.110.102.29 36422