Upstreaming version 0.10.7

[ric-plt/submgr.git] / test / e2t / container / Dockerfile

diff --git a/test/e2t/container/Dockerfile b/test/e2t/container/Dockerfile
index 7b9b3da..e3855f7 100644 (file)
--- a/test/e2t/container/Dockerfile
+++ b/test/e2t/container/Dockerfile
@@ -23,24 +23,19 @@
 
 FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:1-u18.04-nng1.1.1 as submgrbuild
 
-ENV HTTP_PROXY=http://10.144.1.10:8080
-ENV HTTPS_PROXY=http://10.144.1.10:8080
-RUN echo 'use_proxy=yes \n http_proxy=http://10.144.1.10:8080 \n https_proxy=http://10.144.1.10:8080' > /etc/wgetrc
-RUN echo 'Acquire::http::Proxy "http://87.254.212.121:8080/";' > /etc/apt/apt.conf
-
-COPY . /opt/submgr
-
-ARG RMRVERSION=1.3.0
-
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
-RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb
+# Install RMr shared library
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.9.0_amd64.deb/download.deb && dpkg -i rmr_1.9.0_amd64.deb && rm -rf rmr_1.9.0_amd64.deb
+# Install RMr development header files
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.9.0_amd64.deb/download.deb && dpkg -i rmr-dev_1.9.0_amd64.deb && rm -rf rmr-dev_1.9.0_amd64.deb
 
 # "PULLING LOG and COMPILING LOG"
 RUN git clone "https://gerrit.o-ran-sc.org/r/com/log" /opt/log && cd /opt/log && \
  ./autogen.sh && ./configure && make install && ldconfig
 
+WORKDIR /opt/submgr
+
 # "COMPILING E2AP Wrapper"
+COPY e2ap e2ap
 RUN cd /opt/submgr/e2ap && \
  gcc -c -fPIC -Iheaders/ lib/*.c wrapper.c && \
  gcc *.o -shared -o libwrapper.so && \
@@ -55,16 +50,28 @@ RUN cd /usr/local/go/bin \
     && chmod +x swagger
 
 # "Getting and generating routing managers api client"
-RUN cd /opt/submgr \
-    && git clone "https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" \
+COPY api api
+RUN git clone "https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" \
     && cp rtmgr/api/routing_manager.yaml api/ \
     && rm -rf rtmgr
-RUN cd /opt/submgr \
-    && mkdir -p /root/go \
-    && /usr/local/go/bin/swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
 
-RUN mkdir -p /opt/bin && cd /opt/submgr && \
- /usr/local/go/bin/go get && \
+RUN mkdir pkg
+
+COPY go.mod go.mod
+
+RUN mkdir -p /root/go && \
+    /usr/local/go/bin/swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
+
+COPY go.mod go.mod
+
+RUN /usr/local/go/bin/go mod tidy
+
+#Compiling E2T
+COPY pkg pkg
+COPY cmd cmd
+COPY test test
+
+RUN mkdir -p /opt/bin && \
    /usr/local/go/bin/go build -o /opt/test/e2t/e2t ./test/e2t/e2t.go && \
     mkdir -p /opt/test/e2t/container/usr/local
 
@@ -77,4 +84,4 @@ COPY --from=submgrbuild /usr/local/lib /usr/local/lib
 
 RUN ldconfig
 
-RUN chmod 755 /run_e2t.sh
\ No newline at end of file
+RUN chmod 755 /run_e2t.sh