X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=09d92799712da106d399f954411be01bb4ee1e74;hb=cb7dd49aa5f40a880b37a6bc35c972ef2773c164;hp=5276ea5b571ffa86ac52b248d474a053bd6d5488;hpb=1c72bbc4fc5a8ad674dff70abd4713f369ecb43b;p=ric-plt%2Fsubmgr.git diff --git a/Dockerfile b/Dockerfile index 5276ea5..09d9279 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,16 @@ ########################################################### FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as submgrcore +ARG GOVERSION=1.14 + +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/opt/go/${GOVERSION}/bin:/root/go/bin + +# Update CA certificates +RUN apt update && apt install --reinstall -y \ + ca-certificates \ + && \ + update-ca-certificates + RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind WORKDIR /tmp @@ -182,8 +192,8 @@ ENV RMR_SEED_RT=/opt/submgr/test/uta_rtg.rt RUN sed -r "s/^(::1.*)/#\1/" /etc/hosts > /etc/hosts.new \ && cat /etc/hosts.new > /etc/hosts \ && cat /etc/hosts \ - && go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control \ - && go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html + && go test -failfast -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control \ + && go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html # test formating (not important) RUN test -z "$(gofmt -l pkg/control/*.go)" @@ -201,8 +211,9 @@ RUN apt update && apt install -y iputils-ping net-tools curl tcpdump COPY --from=submgrbuild /manifests /manifests COPY --from=submgrbuild /opt/bin/submgr / -COPY --from=submgrbuild /usr/local/include /usr/local/include -COPY --from=submgrbuild /usr/local/lib /usr/local/lib +COPY --from=submgrbuild /usr/local/include/rmr /usr/local/include/ +COPY --from=submgrbuild /usr/local/lib/librmr* /usr/local/lib/ +COPY --from=submgrbuild /usr/local/lib/libe2ap* /usr/local/lib/ RUN ldconfig COPY run_submgr.sh /