From: E. Scott Daniels Date: Wed, 25 Sep 2019 19:20:50 +0000 (-0400) Subject: Repin NNG refs to capture proxy reconnect fix X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=134c56fd7381f3b84f0f3fe70fb233ff25af9228;p=ci-management.git Repin NNG refs to capture proxy reconnect fix A fix to address NNG issues when reconnecting a session through a proxy was made on August 9, 2019 and merged into the NNG master branch with commit ID e618abf8f3db2a9. This change repins the references to the NNG repo such that the fix is incorporated in the NNG library. Signed-off-by: E. Scott Daniels Change-Id: I84d707b6ac65af8e7d78fa6814208532603ea177 --- diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile index 6b0fd3dc..499e1675 100644 --- 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 -# 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 \ - && git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ + && git clone https://github.com/nanomsg/nng.git \ && cd nng \ + && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-alpine3/container-tag.yaml b/docker/bldr-alpine3/container-tag.yaml index c51d3ac0..d6ac6d8e 100644 --- a/docker/bldr-alpine3/container-tag.yaml +++ b/docker/bldr-alpine3/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 5-a3.9 +tag: 6-a3.9-nng diff --git a/docker/bldr-debian-python/Dockerfile b/docker/bldr-debian-python/Dockerfile index c7c58118..1d9a23bd 100644 --- a/docker/bldr-debian-python/Dockerfile +++ b/docker/bldr-debian-python/Dockerfile @@ -35,8 +35,12 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ +# 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 git clone https://github.com/nanomsg/nng.git \ && cd nng \ + && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-debian-python/container-tag.yaml b/docker/bldr-debian-python/container-tag.yaml index 91a8467c..28625423 100755 --- a/docker/bldr-debian-python/container-tag.yaml +++ b/docker/bldr-debian-python/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 3-py3.7-nng1.1.1 +tag: 4-py3.7-nng diff --git a/docker/bldr-ubuntu16-c-go/Dockerfile b/docker/bldr-ubuntu16-c-go/Dockerfile index 0212d7da..60007c4c 100644 --- a/docker/bldr-ubuntu16-c-go/Dockerfile +++ b/docker/bldr-ubuntu16-c-go/Dockerfile @@ -15,13 +15,6 @@ # limitations under the License. # Builder image with superset of CI tools for RIC components -# Uses Ubuntu 16.04 base then adds: -# Standard apt packages including gcc and g++ 5.4 -# Cmake 3.14.5 from binary distro to /usr/local/bin -# Golang 1.12 from binary distro to /usr/local/go -# Ninja 1.9 from binary distro to /usr/local/bin -# Nanomsg Next Gen v1.1.1 from source distro -# Boost 1.69 from source distro FROM nexus3.o-ran-sc.org:10001/ubuntu:16.04 @@ -64,8 +57,12 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ +# 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 git clone https://github.com/nanomsg/nng.git \ && cd nng \ + && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-ubuntu16-c-go/container-tag.yaml b/docker/bldr-ubuntu16-c-go/container-tag.yaml index e44a9fe5..0723c4ae 100644 --- a/docker/bldr-ubuntu16-c-go/container-tag.yaml +++ b/docker/bldr-ubuntu16-c-go/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 1-u16.04-nng1.1.1 +tag: 2-u16.04-nng diff --git a/docker/bldr-ubuntu18-c-go/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile index c8421c95..f7f23b12 100644 --- a/docker/bldr-ubuntu18-c-go/Dockerfile +++ b/docker/bldr-ubuntu18-c-go/Dockerfile @@ -15,13 +15,6 @@ # limitations under the License. # Builder image with superset of CI tools for RIC components -# Uses Ubuntu 18.04 base then adds: -# Standard apt packages including gcc and g++ 5.4 -# Cmake 3.14.5 from binary distro to /usr/local/bin -# Golang 1.12 from binary distro to /usr/local/go -# Ninja 1.9 from binary distro to /usr/local/bin -# Nanomsg Next Gen v1.1.1 from source distro -# Boost 1.69 from source distro FROM nexus3.o-ran-sc.org:10001/ubuntu:18.04 @@ -64,8 +57,12 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ +# 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 git clone https://github.com/nanomsg/nng.git \ && cd nng \ + && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-ubuntu18-c-go/container-tag.yaml b/docker/bldr-ubuntu18-c-go/container-tag.yaml index b42a0da2..15d012ee 100644 --- a/docker/bldr-ubuntu18-c-go/container-tag.yaml +++ b/docker/bldr-ubuntu18-c-go/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 1-u18.04-nng1.1.1 +tag: 2-u18.04-nng