X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=dd4da51ce8bf3dfefbb278fc4e97a7ec81f4428a;hb=47518ae7612cbfb1562fa1f74b9023389d8cfd61;hp=7e396b40ab03d2e25f57085ef260342a7512a948;hpb=d455ca0e4d8c05777e3f91350a04ee6c3359da24;p=ric-plt%2Fsubmgr.git diff --git a/Dockerfile b/Dockerfile index 7e396b4..dd4da51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ########################################################### # ########################################################### -FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as submgrcore +FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as submgrcore RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind @@ -57,9 +57,9 @@ RUN export GOBIN=/usr/local/bin/ ; \ # # RMR # -ARG RMRVERSION=4.4.6 -ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb -ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb +ARG RMRVERSION=4.5.2 +ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb +ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb RUN wget --content-disposition ${RMRLIBURL} && dpkg -i rmr_${RMRVERSION}_amd64.deb RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb @@ -121,10 +121,7 @@ FROM submgre2apbuild as submgrbuild # # COPY go.mod go.mod -COPY go.sum go.sum - RUN go mod download -RUN go mod tidy # # @@ -153,13 +150,13 @@ RUN echo "rtmgrapi ${RTMGRVERSION} https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" COPY pkg pkg COPY cmd cmd +COPY go.sum go.sum +RUN go mod tidy + RUN mkdir -p /opt/bin && \ go build -o /opt/bin/submgr cmd/submgr.go && \ mkdir -p /opt/build/container/usr/local - -RUN go mod tidy - RUN cp go.mod go.sum /manifests/ RUN grep gerrit /manifests/go.sum > /manifests/go_gerrit.sum @@ -203,7 +200,6 @@ FROM ubuntu:18.04 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