install: adjustments to building ospf mdr deb package, update to dock…

…er install docs and easier breakdown of dedicated dockerfiles

dockerfiles/Dockerfile.ospf-mdr-deb

@@ -0,0 +1,32 @@
+# syntax=docker/dockerfile:1
+FROM ubuntu:22.04
+WORKDIR /opt
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+    git \
+    ca-certificates \
+    automake \
+    make \
+    libtool \
+    pkg-config \
+    gawk \
+    g++ \
+    dpkg-dev \
+    debhelper \
+    libreadline-dev \
+    texinfo \
+    imagemagick \
+    groff \
+    build-essential:native \
+    texlive-latex-recommended \
+    texlive-plain-generic && \
+    git clone https://github.com/USNavalResearchLaboratory/ospf-mdr.git && \
+    cd ospf-mdr && \
+    ./bootstrap.sh && \
+    ./configure && \
+    (make -f quagga.deb.mk build || make -f quagga.deb.mk build) && \
+    mv quagga-mr_0.99*.deb /opt/ && \
+    cd /opt && \
+    rm -rf ospf-mdr && \
+    apt-get autoremove -y && \
+    rm -rf /var/lib/apt/lists/*

dockerfiles/Dockerfile.ospf-mdr-rpm

@@ -0,0 +1,33 @@
+# syntax=docker/dockerfile:1
+FROM rockylinux:8
+WORKDIR /opt
+RUN yum update -y && \
+    yum install -y epel-release dnf-plugins-core && \
+    yum config-manager --set-enabled powertools && \
+    yum update -y && \
+    yum install -y \
+    texinfo \
+    rpm-build \
+    texlive-base \
+    texinfo-tex \
+    texi2html \
+    readline-devel \
+    libpcap-devel \
+    ImageMagick \
+    git \
+    automake \
+    libtool \
+    pkg-config \
+    gcc-c++ \
+    libcap-devel \
+    make && \
+    git clone https://github.com/USNavalResearchLaboratory/ospf-mdr.git && \
+    cd ospf-mdr && \
+    ./bootstrap.sh && \
+    ./configure && \
+    (make -f quagga.rpm.mk build || make -f quagga.rpm.mk build) && \
+    mv .rpmbuild/RPMS/x86_64/quagga-mr-0.99*.rpm /opt/ && \
+    cd /opt && \
+    rm -rf ospf-mdr && \
+    yum autoremove -y && \
+    yum clean all

dockerfiles/Dockerfile.ubuntu

@@ -27,37 +27,6 @@ RUN apt-get update -y && \
     ./quagga-mr_0.99*.deb && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
-#RUN apt-get update -y && \
-#    apt-get install -y --no-install-recommends \
-#    automake \
-#    gawk \
-#    g++ \
-#    libreadline-dev \
-#    libtool \
-#    make \
-#    pkg-config \
-#    git && \
-#    git clone https://github.com/USNavalResearchLaboratory/ospf-mdr.git && \
-#    cd ospf-mdr && \
-#    ./bootstrap.sh && \
-#    ./configure --disable-doc --enable-user=root --enable-group=root \
-#        --with-cflags=-ggdb --sysconfdir=/usr/local/etc/quagga --enable-vtysh \
-#        --localstatedir=/var/run/quagga && \
-#    make -j$(nproc) && \
-#    make install && \
-#    cd /opt && \
-#    rm -rf ospf-mdr && \
-#    apt-get remove -y \
-#    automake \
-#    gawk \
-#    g++ \
-#    libreadline-dev \
-#    libtool \
-#    make \
-#    pkg-config \
-#    git && \
-#    apt-get autoremove -y && \
-#    rm -rf /var/lib/apt/lists/*
 
 # install emane
 ARG EMANE_RELEASE=emane-1.5.1-release-1

docs/install_docker.md

@@ -21,10 +21,13 @@ Provided Dockerfiles:
 ```shell
 # clone core
 git clone https://github.com/coreemu/core.git
+cd core
 # first you must build EMANE python bindings
-docker build -t emane-python -f dockerfiles/Dockerfile.emane-python .
+sudo docker build -t emane-python -f dockerfiles/Dockerfile.emane-python .
+# build ospf packages
+sudo docker build -t ospf-rpm -f dockerfiles/Dockerfile.ospf-mdr-rpm .
+sudo docker build -t ospf-deb -f dockerfiles/Dockerfile.ospf-mdr-deb .
 # build desired CORE image
-cd core
 sudo docker build -t core -f dockerfiles/<Dockerfile> .
 ```