updated dockerfiles to align with protobuf changes

coreemu · Nov 28, 2022 · 6c52029 · 6c52029
1 parent 41b231b
commit 6c52029
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/dockerfiles/Dockerfile.centos b/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 && \

diff --git a/dockerfiles/Dockerfile.centos-package b/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 && \

diff --git a/dockerfiles/Dockerfile.ubuntu b/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

diff --git a/dockerfiles/Dockerfile.ubuntu-package b/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