Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Prepare for docker image release for NONRTRIC repo"
[ci-management.git]
/
docker
/
bldr-alpine3
/
Dockerfile
diff --git
a/docker/bldr-alpine3/Dockerfile
b/docker/bldr-alpine3/Dockerfile
index
44abe56
..
499e167
100644
(file)
--- a/
docker/bldr-alpine3/Dockerfile
+++ b/
docker/bldr-alpine3/Dockerfile
@@
-50,10
+50,13
@@
RUN cd /tmp \
&& cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \
&& rm -rf /tmp/autoconf-archive
&& cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \
&& rm -rf /tmp/autoconf-archive
-# NNG, version is pinned
+# NNG repo is not frequently tagged so it's pinned to a commit hash.
+# This commit provides fix to the proxy-reconnect
+# bug that we identified: https://github.com/nanomsg/nng/issues/970
RUN cd /tmp \
RUN cd /tmp \
- && git clone
--branch v1.1.1
https://github.com/nanomsg/nng.git \
+ && git clone https://github.com/nanomsg/nng.git \
&& cd nng \
&& cd nng \
+ && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
&& mkdir build \
&& cd build \
&& cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
&& mkdir build \
&& cd build \
&& cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
@@
-71,7
+74,7
@@
RUN cd /tmp \
# RMR, version is pinned
RUN cd /tmp \
# RMR, version is pinned
RUN cd /tmp \
- && git clone --branch 1.
0.45
https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
+ && git clone --branch 1.
3.0
https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
&& cd rmr \
&& mkdir build \
&& cd build \
&& cd rmr \
&& mkdir build \
&& cd build \