Code Review
/
ric-app
/
mc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Correct unit test invocation in cmake file
[ric-app/mc.git]
/
sidecars
/
listener
/
Dockerfile
diff --git
a/sidecars/listener/Dockerfile
b/sidecars/listener/Dockerfile
index
b07aed5
..
c29c416
100644
(file)
--- a/
sidecars/listener/Dockerfile
+++ b/
sidecars/listener/Dockerfile
@@
-41,17
+41,18
@@
# Author: E. Scott Daniels
# Author: E. Scott Daniels
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as buildenv
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as buildenv
+
RUN mkdir /playpen
RUN apt-get update && apt-get install -y cmake gcc make git g++ wget
WORKDIR /playpen
# Install RMr (runtime and dev) from debian package cached on packagecloud.io
RUN mkdir /playpen
RUN apt-get update && apt-get install -y cmake gcc make git g++ wget
WORKDIR /playpen
# Install RMr (runtime and dev) from debian package cached on packagecloud.io
-ARG RMR_VER=
3.1.2
+ARG RMR_VER=
4.0.5
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/
staging
/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/
staging
/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/
release
/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/
release
/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
RUN dpkg -i rmr_${RMR_VER}_amd64.deb
RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
RUN dpkg -i rmr_${RMR_VER}_amd64.deb
RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
@@
-81,6
+82,10
@@
FROM ubuntu:18.04
RUN apt-get update; apt-get install -y ksh
RUN rm -fr /var/lib/apt/lists
RUN apt-get update; apt-get install -y ksh
RUN rm -fr /var/lib/apt/lists
+# must have rmr runtime to get health check etc
+COPY --from=buildenv /playpen/rmr_*.deb /tmp/
+RUN dpkg -i /tmp/rmr_*_amd64.deb
+
# obtusely this uses the previous value
ARG SRC
# obtusely this uses the previous value
ARG SRC