Code Review
/
ric-plt
/
a1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade xapp-frame-go module in integration tests
[ric-plt/a1.git]
/
integration_tests
/
testxappcode
/
Dockerfile-query-receiver
diff --git
a/integration_tests/testxappcode/Dockerfile-query-receiver
b/integration_tests/testxappcode/Dockerfile-query-receiver
old mode 100644
(file)
new mode 100755
(executable)
index
e45b15a
..
ce861b6
--- a/
integration_tests/testxappcode/Dockerfile-query-receiver
+++ b/
integration_tests/testxappcode/Dockerfile-query-receiver
@@
-16,7
+16,7
@@
# ==================================================================================
# This Dockerfile uses a two stage Docker build
# ==================================================================================
# This Dockerfile uses a two stage Docker build
-FROM nexus3.o-ran-sc.org:10004/bldr-alpine3
-go:5-a3.11-nng
-rmr3
+FROM nexus3.o-ran-sc.org:10004/bldr-alpine3
:10-a3.11
-rmr3
# go will complain if there is a go.mod at the root of the GOPATH so we can't.
RUN mkdir myxapp
# go will complain if there is a go.mod at the root of the GOPATH so we can't.
RUN mkdir myxapp
@@
-32,8
+32,11
@@
RUN go build -a -installsuffix cgo -o receiver receiver.go
# 2nd stage
FROM alpine:3.11
# 2nd stage
FROM alpine:3.11
-COPY --from=0 /usr/local/lib64/librmr_si.so* /usr/local/lib64/
-COPY --from=0 /go/myxapp/receiver .
+
+# 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 --from=0 /myxapp/receiver .
COPY query-config-file.yaml .
# rmr setup
COPY query-config-file.yaml .
# rmr setup