X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ci%2FDockerfile;h=f0c1c0bebdc84152cec5c08d3f1bc4c46710da65;hb=HEAD;hp=33725201305ce21b198b16790e526cedaee15f55;hpb=3cfee96f252fa5d63bb8062f8ade1e9697103a7b;p=ric-plt%2Fxapp-frame.git

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 3372520..54da15c 100755
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,7 +17,8 @@
 #
 #----------------------------------------------------------
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as xapp-base
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.1.0 as xapp-base
+
 
 RUN apt-get update -y \
     &&apt-get install -y \
@@ -36,10 +37,10 @@ RUN apt-get update -y \
 RUN curl -s https://packagecloud.io/install/repositories/o-ran-sc/master/script.deb.sh | bash
 
 # RMR
-ARG RMRVERSION=1.13.1
+ARG RMRVERSION=4.9.4
 #RUN apt-get install -y rmr=${RMRVERSION} rmr-dev=${RMRVERSION}
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/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/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/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/release/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
 
 #
@@ -56,7 +57,6 @@ CMD ["/bin/bash"]
 #----------------------------------------------------------
 FROM xapp-base as xapp-base-testbuild
 
-
 RUN mkdir -p /ws
 WORKDIR "/ws"
 
@@ -74,5 +74,14 @@ RUN make -C /ws go-build
 # Test fmt
 RUN make -C /ws go-test-fmt
 
-# Test Requires dbaas
-RUN make -C /ws go-test
+# Alternative way to run tests:
+#   If there is ipv6 in use, then there might be problems if
+#   "localhost" is resolved as ipv6 address
+#   --> Comment out ipv6 hosts file entries before running tests
+#RUN sed -r  "s/^(::1.*)/#\1/" /etc/hosts  > /etc/hosts.new \
+#    && cat /etc/hosts.new > /etc/hosts \
+#    && cat /etc/hosts  \
+#    && make -C /ws go-test
+
+#Temporarily not executing tests cases as modifying /etc/hosts causes some issue
+#RUN  make -C /ws go-test