Merge pull request #718 from coreemu/develop

release 9.0.1

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2022-11-28 CORE 9.0.1
+
+* Installation
+    * updated protobuf and grpcio-tools versions in pyproject.toml to account for bad version mix
+
 ## 2022-11-18 CORE 9.0.0
 
 * Breaking Changes

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # this defines the CORE version number, must be static for AC_INIT
-AC_INIT(core, 9.0.0)
+AC_INIT(core, 9.0.1)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])

daemon/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "core"
-version = "9.0.0"
+version = "9.0.1"
 description = "CORE Common Open Research Emulator"
 authors = ["Boeing Research and Technology"]
 license = "BSD-2-Clause"
@@ -30,7 +30,7 @@ grpcio = "1.49.1"
 invoke = "1.4.1"
 lxml = "4.9.1"
 netaddr = "0.7.19"
-protobuf = "3.19.5"
+protobuf = "4.21.9"
 pyproj = "3.3.1"
 pyyaml = "5.4"
 Pillow = "9.2.0"
@@ -39,13 +39,13 @@ Mako = "1.2.3"
 [tool.poetry.dev-dependencies]
 black = "==19.3b0"
 flake8 = "3.8.2"
-grpcio-tools = "1.43.0"
 isort = "4.3.21"
 mock = "4.0.2"
 pre-commit = "2.1.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "6.2.5"
+grpcio-tools = "1.49.1"
 
 [tool.isort]
 skip_glob = "*_pb2*.py,doc,build"

dockerfiles/Dockerfile.centos

@@ -44,9 +44,10 @@ RUN wget -q https://adjacentlink.com/downloads/emane/emane-1.3.3-release-1.el7.x
     cd ../../../.. && \
     rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \
     rm -rf emane-1.3.3-release-1
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip && \
+
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.6/protoc-3.19.6-linux-x86_64.zip && \
     mkdir protoc && \
-    unzip protoc-3.7.1-linux-x86_64.zip -d protoc
+    unzip protoc-3.19.6-linux-x86_64.zip -d protoc
 RUN git clone https://github.com/adjacentlink/emane.git
 RUN PATH=/opt/protoc/bin:$PATH && \
   cd emane && \

dockerfiles/Dockerfile.centos-package

@@ -44,9 +44,9 @@ RUN wget -q https://adjacentlink.com/downloads/emane/emane-1.3.3-release-1.el7.x
     cd ../../../.. && \
     rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \
     rm -rf emane-1.3.3-release-1
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip && \
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.6/protoc-3.19.6-linux-x86_64.zip && \
     mkdir protoc && \
-    unzip protoc-3.7.1-linux-x86_64.zip -d protoc
+    unzip protoc-3.19.6-linux-x86_64.zip -d protoc
 RUN git clone https://github.com/adjacentlink/emane.git
 RUN PATH=/opt/protoc/bin:$PATH && \
   cd emane && \

dockerfiles/Dockerfile.ubuntu

@@ -18,19 +18,26 @@ WORKDIR /opt
 RUN git clone https://github.com/coreemu/core
 WORKDIR /opt/core
 RUN git checkout ${BRANCH}
-RUN NO_SYSTEM=1 ./setup.sh
+RUN ./setup.sh
 RUN . /root/.bashrc && inv install -v -p ${PREFIX}
 ENV PATH "$PATH:/opt/core/venv/bin"
 
 # install emane
-RUN apt-get install -y libpcap-dev libpcre3-dev libprotobuf-dev libxml2-dev protobuf-compiler uuid-dev
+RUN apt-get install -y libpcap-dev libpcre3-dev libprotobuf-dev libxml2-dev protobuf-compiler unzip uuid-dev
 WORKDIR /opt
 RUN git clone https://github.com/adjacentlink/emane.git
 RUN cd emane && \
   ./autogen.sh && \
   ./configure --prefix=/usr && \
   make -j$(nproc)  && \
   make install
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.6/protoc-3.19.6-linux-x86_64.zip && \
+    mkdir protoc && \
+    unzip protoc-3.19.6-linux-x86_64.zip -d protoc
+RUN PATH=/opt/protoc/bin:$PATH && \
+  cd emane/src/python && \
+  make clean && \
+  make
 RUN /opt/core/venv/bin/python -m pip install emane/src/python
 
 # run daemon

dockerfiles/Dockerfile.ubuntu-package

@@ -28,12 +28,19 @@ RUN cd ospf-mdr && \
   make install
 
 # install emane
-RUN apt-get install -y libpcap-dev libpcre3-dev libprotobuf-dev libxml2-dev protobuf-compiler uuid-dev
+RUN apt-get install -y libpcap-dev libpcre3-dev libprotobuf-dev libxml2-dev protobuf-compiler unzip uuid-dev
 WORKDIR /opt
 RUN git clone https://github.com/adjacentlink/emane.git
 RUN cd emane && \
   ./autogen.sh && \
   ./configure --prefix=/usr && \
   make -j$(nproc)  && \
   make install
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.6/protoc-3.19.6-linux-x86_64.zip && \
+    mkdir protoc && \
+    unzip protoc-3.19.6-linux-x86_64.zip -d protoc
+RUN PATH=/opt/protoc/bin:$PATH && \
+  cd emane/src/python && \
+  make clean && \
+  make
 RUN /opt/core/venv/bin/python -m pip install emane/src/python