Labeled metrics interface

[ric-plt/xapp-frame.git] / ci / Dockerfile

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 01e768d..69badcf 100755 (executable)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,7 +17,14 @@
 #
 #----------------------------------------------------------
 
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as xapp-base
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as xapp-base
+
+ARG g16="1.16.4"
+RUN wget -nv https://dl.google.com/go/go${g16}.linux-amd64.tar.gz \
+    && tar -xf go${g16}.linux-amd64.tar.gz \
+    && mv go /opt/go/1.16 \
+    && rm -f go*.gz
+
 RUN apt-get update -y \
     &&apt-get install -y \
     apt-utils \
@@ -32,10 +39,13 @@ RUN apt-get update -y \
     curl \
     tree
 
+ARG GOVERSION=1.16
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/go/${GOVERSION}/bin
+
 RUN curl -s https://packagecloud.io/install/repositories/o-ran-sc/master/script.deb.sh | bash
 
 # RMR
-ARG RMRVERSION=4.0.5
+ARG RMRVERSION=4.2.2
 #RUN apt-get install -y rmr=${RMRVERSION} rmr-dev=${RMRVERSION}
 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
@@ -74,4 +84,9 @@ RUN make -C /ws go-build
 RUN make -C /ws go-test-fmt
 
 # Test Requires dbaas
-RUN make -C /ws go-test
+#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
+
+RUN  make -C /ws go-test