X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=integration_tests%2Ftestxappcode%2FDockerfile-query-receiver;h=a7dd178f1559b0d7c487f16c958628754a073331;hb=ec6b6cf412ded7fbcbdf19b816d21b7c6a2229ba;hp=ce861b6e8d7ec0b76bf111f5dd3412f7497e383a;hpb=9640e5bf05192f4a614f519934802fbe31865fed;p=ric-plt%2Fa1.git diff --git a/integration_tests/testxappcode/Dockerfile-query-receiver b/integration_tests/testxappcode/Dockerfile-query-receiver old mode 100755 new mode 100644 index ce861b6..a7dd178 --- a/integration_tests/testxappcode/Dockerfile-query-receiver +++ b/integration_tests/testxappcode/Dockerfile-query-receiver @@ -16,7 +16,11 @@ # ================================================================================== # This Dockerfile uses a two stage Docker build -FROM nexus3.o-ran-sc.org:10004/bldr-alpine3:10-a3.11-rmr3 +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-alpine3:12-a3.11 + +# copy rmr headers and libraries from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/include/rmr /usr/local/include/rmr +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/lib64/librmr* /usr/local/lib64/ # go will complain if there is a go.mod at the root of the GOPATH so we can't. RUN mkdir myxapp @@ -33,8 +37,8 @@ RUN go build -a -installsuffix cgo -o receiver receiver.go # 2nd stage FROM alpine:3.11 -# copy rmr .so from builder image in lieu of an Alpine package -COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr libraries from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/lib64/librmr* /usr/local/lib64/ COPY --from=0 /myxapp/receiver . COPY query-config-file.yaml .