Docker: frr-deps: add librtr and libyang

This commit is contained in:
Christian Poessinger 2019-01-13 11:16:27 +01:00
parent 805ad7318a
commit f212e76a3b
2 changed files with 24 additions and 20 deletions

9
Jenkinsfile vendored
View File

@ -50,20 +50,11 @@ pipeline {
'''
}
}
stage('Deploy') {
steps {
archiveArtifacts artifacts: 'build/vyos-*-rolling*.iso', fingerprint: true
}
}
}
post {
always {
echo 'One way or another, I have finished'
// change build dir file permissions so wen can cleanup as regular
// user (jenkins) afterwards
sh 'sudo chmod -R 777 .'
echo 'No cleanup for now ....'
deleteDir() /* cleanup our workspace */
}
}

View File

@ -123,6 +123,28 @@ RUN apt-get update && apt-get install -y \
cmake \
liblua5.1-dev
# Prerequisites for building FRR from source
# see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
#
# librtr
RUN apt-get update && apt-get install -y \
doxygen \
libssh-dev
RUN export RTRLIB_COMMIT="v0.6.3" && \
git clone https://github.com/rtrlib/rtrlib.git && \
cd rtrlib && git checkout $RTRLIB_COMMIT && \
dpkg-buildpackage -uc -us -tc -b && dpkg -i ../*.deb
# Prerequisites for building FRR from source
# see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
#
RUN export LIBYANG_COMMIT="v0.16-r2" && \
git clone https://github.com/CESNET/libyang.git && \
cd libyang && git checkout $LIBYANG_COMMIT && mkdir build && cd build && \
cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && \
make && make install
# Packages needed for frr
RUN apt-get update && apt-get install -y \
libreadline-dev \
@ -137,20 +159,11 @@ RUN apt-get update && apt-get install -y \
libjson0-dev \
python-ipaddr \
python3-dev \
python3-pip \
python3-pytest \
install-info \
libc-ares-dev \
libc-ares2
# 3rd-party depndencies required for building FRR, see
# http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
RUN pip3 install pytest
RUN git clone https://github.com/opensourcerouting/libyang /tmp/libyang && \
cd /tmp/libyang && \
git checkout -b tmp origin/tmp && \
mkdir build; cd build && \
cmake -DENABLE_LYD_PRIV=ON .. && \
make && make install
# Update live-build
RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list &&\
apt-get update &&\