afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated dockerfiles to align with protobuf changes

Browse source
This commit is contained in:
Blake Harnden 2022-11-28 14:02:46 -08:00
parent 41b231b577
commit 6c52029795
4 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dockerfiles/Dockerfile.centos
View file

@ -44,9 +44,10 @@ RUN wget -q https://adjacentlink.com/downloads/emane/emane-1.3.3-release-1.el7.x
cd ../../../.. && \ cd ../../../.. && \
rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \ rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \
rm -rf emane-1.3.3-release-1 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 && \ 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 git clone https://github.com/adjacentlink/emane.git
RUN PATH=/opt/protoc/bin:$PATH && \ RUN PATH=/opt/protoc/bin:$PATH && \
cd emane && \ cd emane && \

4
dockerfiles/Dockerfile.centos-package
View file

@ -44,9 +44,9 @@ RUN wget -q https://adjacentlink.com/downloads/emane/emane-1.3.3-release-1.el7.x
cd ../../../.. && \ cd ../../../.. && \
rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \ rm emane-1.3.3-release-1.el7.x86_64.tar.gz && \
rm -rf emane-1.3.3-release-1 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 && \ 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 git clone https://github.com/adjacentlink/emane.git
RUN PATH=/opt/protoc/bin:$PATH && \ RUN PATH=/opt/protoc/bin:$PATH && \
cd emane && \ cd emane && \

11
dockerfiles/Dockerfile.ubuntu
View file

@ -18,12 +18,12 @@ WORKDIR /opt
RUN git clone https://github.com/coreemu/core RUN git clone https://github.com/coreemu/core
WORKDIR /opt/core WORKDIR /opt/core
RUN git checkout ${BRANCH} RUN git checkout ${BRANCH}
RUN NO_SYSTEM=1 ./setup.sh RUN ./setup.sh
RUN . /root/.bashrc && inv install -v -p ${PREFIX} RUN . /root/.bashrc && inv install -v -p ${PREFIX}
ENV PATH "$PATH:/opt/core/venv/bin" ENV PATH "$PATH:/opt/core/venv/bin"
# install emane # 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 WORKDIR /opt
RUN git clone https://github.com/adjacentlink/emane.git RUN git clone https://github.com/adjacentlink/emane.git
RUN cd emane && \ RUN cd emane && \
@ -31,6 +31,13 @@ RUN cd emane && \
./configure --prefix=/usr && \ ./configure --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \
make install 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 /opt/core/venv/bin/python -m pip install emane/src/python
# run daemon # run daemon

9
dockerfiles/Dockerfile.ubuntu-package
View file

@ -28,7 +28,7 @@ RUN cd ospf-mdr && \
make install make install
# install emane # 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 WORKDIR /opt
RUN git clone https://github.com/adjacentlink/emane.git RUN git clone https://github.com/adjacentlink/emane.git
RUN cd emane && \ RUN cd emane && \
@ -36,4 +36,11 @@ RUN cd emane && \
./configure --prefix=/usr && \ ./configure --prefix=/usr && \
make -j$(nproc) && \ make -j$(nproc) && \
make install 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 /opt/core/venv/bin/python -m pip install emane/src/python