diff --git a/dockerfiles/Dockerfile.ubuntu b/dockerfiles/Dockerfile.ubuntu index fa7d2ae9..8a790f66 100644 --- a/dockerfiles/Dockerfile.ubuntu +++ b/dockerfiles/Dockerfile.ubuntu @@ -37,19 +37,28 @@ RUN git clone https://github.com/coreemu/core && \ rm -rf ospf-mdr # install emane +ARG EMANE_RELEASE=emane-1.5.1-release-1 +ARG EMANE_PACKAGE=${EMANE_RELEASE}.ubuntu-22_04.amd64.tar.gz +RUN wget -q https://adjacentlink.com/downloads/emane/${EMANE_PACKAGE} && \ + tar xf ${EMANE_PACKAGE} && \ + cd ${EMANE_RELEASE}/debs/ubuntu-22_04/amd64 && \ + apt-get install -y ./openstatistic*.deb ./emane*.deb ./python3-emane_*.deb && \ + cd ../../../.. && \ + rm ${EMANE_PACKAGE} && \ + rm -rf ${EMANE_RELEASE} + +# install emane python bindings ARG VENV_PATH=/opt/core/venv ARG PROTOC_VERSION=3.19.6 -RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ +RUN wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ mkdir protoc && \ unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d protoc && \ git clone https://github.com/adjacentlink/emane.git && \ cd emane && \ + git checkout v1.5.1 && \ ./autogen.sh && \ - ./configure --prefix=/usr && \ - make -j$(nproc) && \ - make install && \ + PYTHON=${VENV_PATH}/bin/python ./configure --prefix=/usr && \ cd src/python && \ - make clean && \ PATH=/opt/protoc/bin:$PATH make && \ ${VENV_PATH}/bin/python -m pip install . && \ cd /opt && \ diff --git a/dockerfiles/Dockerfile.ubuntu-package b/dockerfiles/Dockerfile.ubuntu-package index 29baa865..1164b15e 100644 --- a/dockerfiles/Dockerfile.ubuntu-package +++ b/dockerfiles/Dockerfile.ubuntu-package @@ -35,7 +35,7 @@ RUN apt-get update -y && \ # install core WORKDIR /opt ARG PACKAGE_URL=https://github.com/coreemu/core/releases/latest/download/core_9.0.3_amd64.deb -RUN wget ${PACKAGE_URL} && \ +RUN wget -q ${PACKAGE_URL} && \ apt-get install -y ./core_*.deb && \ rm -f core_*.deb @@ -52,19 +52,28 @@ RUN git clone https://github.com/USNavalResearchLaboratory/ospf-mdr.git && \ rm -rf ospf-mdr # install emane +ARG EMANE_RELEASE=emane-1.5.1-release-1 +ARG EMANE_PACKAGE=${EMANE_RELEASE}.ubuntu-22_04.amd64.tar.gz +RUN wget -q https://adjacentlink.com/downloads/emane/${EMANE_PACKAGE} && \ + tar xf ${EMANE_PACKAGE} && \ + cd ${EMANE_RELEASE}/debs/ubuntu-22_04/amd64 && \ + apt-get install -y ./openstatistic*.deb ./emane*.deb ./python3-emane_*.deb && \ + cd ../../../.. && \ + rm ${EMANE_PACKAGE} && \ + rm -rf ${EMANE_RELEASE} + +# install emane python bindings ARG VENV_PATH=/opt/core/venv ARG PROTOC_VERSION=3.19.6 -RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ +RUN wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ mkdir protoc && \ unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d protoc && \ git clone https://github.com/adjacentlink/emane.git && \ cd emane && \ + git checkout v1.5.1 && \ ./autogen.sh && \ - ./configure --prefix=/usr && \ - make -j$(nproc) && \ - make install && \ + PYTHON=${VENV_PATH}/bin/python ./configure --prefix=/usr && \ cd src/python && \ - make clean && \ PATH=/opt/protoc/bin:$PATH make && \ ${VENV_PATH}/bin/python -m pip install . && \ cd /opt && \ diff --git a/docs/install_centos.md b/docs/install_centos.md index 9cf083dc..b9fb9ac4 100644 --- a/docs/install_centos.md +++ b/docs/install_centos.md @@ -83,6 +83,7 @@ python3.9 -m pip install --upgrade pip # install core cd ~/Documents +wget https://github.com/coreemu/core/releases/latest/download/core__x86_64.rpm sudo PYTHON=python3.9 yum install -y ./core_*.rpm # install ospf mdr diff --git a/docs/install_ubuntu.md b/docs/install_ubuntu.md index dc00db0b..b69bdda6 100644 --- a/docs/install_ubuntu.md +++ b/docs/install_ubuntu.md @@ -29,17 +29,22 @@ inv install # install emane cd ~/Documents +wget https://adjacentlink.com/downloads/emane/emane-1.5.1-release-1.ubuntu-22_04.amd64.tar.gz +tar xf emane-1.5.1-release-1.ubuntu-22_04.amd64.tar.gz +cd emane-1.5.1-release-1/debs/ubuntu-22_04/amd64 +apt-get install -y ./openstatistic*.deb ./emane*.deb ./python3-emane_*.deb + +# install emane python bindings +cd ~/Documents 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 git clone https://github.com/adjacentlink/emane.git cd emane +git checkout v1.5.1 ./autogen.sh ./configure --prefix=/usr -make -j$(nproc) -sudo make install cd src/python -make clean PATH=~/Documents/protoc/bin:$PATH make sudo /opt/core/venv/bin/python -m pip install . ``` @@ -60,6 +65,7 @@ sudo apt-get install -y ca-certificates python3 python3-tk python3-pip python3-v # install core cd ~/Documents +wget https://github.com/coreemu/core/releases/latest/download/core__amd64.deb sudo apt-get install -y ./core_*.deb # install ospf mdr @@ -75,17 +81,22 @@ sudo make install # install emane cd ~/Documents +wget https://adjacentlink.com/downloads/emane/emane-1.5.1-release-1.ubuntu-22_04.amd64.tar.gz +tar xf emane-1.5.1-release-1.ubuntu-22_04.amd64.tar.gz +cd emane-1.5.1-release-1/debs/ubuntu-22_04/amd64 +apt-get install -y ./openstatistic*.deb ./emane*.deb ./python3-emane_*.deb + +# install emane python bindings +cd ~/Documents 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 git clone https://github.com/adjacentlink/emane.git cd emane +git checkout v1.5.1 ./autogen.sh ./configure --prefix=/usr -make -j$(nproc) -sudo make install cd src/python -make clean PATH=~/Documents/protoc/bin:$PATH make sudo /opt/core/venv/bin/python -m pip install . ```