Pin NNG to release version 1.1.1

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I010906233f3b4988288d70c13d7d7759b4cf4243

diff --git a/docker/bldr-debian-python-nng/Dockerfile b/docker/bldr-debian-python-nng/Dockerfile
index bfb46fc..f2ae43e 100644 (file)
--- a/docker/bldr-debian-python-nng/Dockerfile
+++ b/docker/bldr-debian-python-nng/Dockerfile
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # Builder image with CI tools for RIC components
 # uses Python 3.7 (Debian stretch) base which has
 # C and C++ tools from buildpack-deps:stretch then adds:
@@ -38,6 +37,7 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja
 
 RUN git clone https://github.com/nanomsg/nng.git \
     && cd nng \
+    && git checkout v1.1.1 \
     && mkdir build \
     && cd build \
     && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \

diff --git a/docker/bldr-debian-python-nng/container-tag.yaml b/docker/bldr-debian-python-nng/container-tag.yaml
old mode 100644 (file)
new mode 100755 (executable)
index 49e7813..b575d2e
--- a/docker/bldr-debian-python-nng/container-tag.yaml
+++ b/docker/bldr-debian-python-nng/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-py3.7
+tag: 2-py3.7-nng1.1.1

diff --git a/docker/bldr-ubuntu-c-go-nng/Dockerfile b/docker/bldr-ubuntu-c-go-nng/Dockerfile
index 90e7d01..6809e09 100644 (file)
--- a/docker/bldr-ubuntu-c-go-nng/Dockerfile
+++ b/docker/bldr-ubuntu-c-go-nng/Dockerfile
@@ -50,6 +50,7 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja
 
 RUN git clone https://github.com/nanomsg/nng.git \
     && cd nng \
+    && git checkout v1.1.1 \
     && mkdir build \
     && cd build \
     && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \

diff --git a/docker/bldr-ubuntu-c-go-nng/container-tag.yaml b/docker/bldr-ubuntu-c-go-nng/container-tag.yaml
index e10aaa8..a97f6b1 100644 (file)
--- a/docker/bldr-ubuntu-c-go-nng/container-tag.yaml
+++ b/docker/bldr-ubuntu-c-go-nng/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: 2-u16.04
+tag: 3-u16.04-nng1.1.1