X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ci%2FDockerfile;h=71aaed31c11ea2844f8ea7239c8fdd5760cee188;hb=refs%2Fchanges%2F26%2F7026%2F1;hp=83031145c94ddb73f1b1e65c4040f986e45be05c;hpb=5953f7e372df54c71f526e9519e8eb0ee7ee6f72;p=ric-plt%2Fxapp-frame.git diff --git a/ci/Dockerfile b/ci/Dockerfile index 8303114..71aaed3 100755 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -17,7 +17,9 @@ # #---------------------------------------------------------- -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.0.0 as xapp-base + + RUN apt-get update -y \ &&apt-get install -y \ apt-utils \ @@ -35,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=3.6.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/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 # @@ -73,5 +75,9 @@ RUN make -C /ws go-build # Test fmt 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