Docker: T5076: unbloat container - remove dependencies for frr

2 files changed, 4 insertions, 60 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b0bed95f..02554e07 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -221,65 +221,13 @@ RUN apt-get update && apt-get install -y \
       build-essential
 RUN gem install --no-document fpm
 
-# Prerequisites for building rtrlib
-# see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
-RUN apt-get update && apt-get install -y \
-      cmake \
-      dpkg-dev \
-      debhelper \
-      libssh-dev \
-      doxygen
-
 # Build rtrlib release 0.8.0
 RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
     git clone https://github.com/rtrlib/rtrlib.git /tmp/rtrlib && cd /tmp/rtrlib && \
+    mk-build-deps --install --tool "apt-get --yes --no-install-recommends" && \
     dpkg-buildpackage -uc -us -tc -b && \
     dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb
 
-# Packages needed to build libyang2
-RUN apt-get update && apt-get install -y \
-      graphviz \
-      cmake \
-      libpcre3-dev
-
-# 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="v2.0.164" && \
-    git clone https://github.com/CESNET/libyang.git && \
-    cd libyang && git checkout $LIBYANG_COMMIT && pipx run apkg build -i && \
-    cd pkg/pkgs/debian-*/libyang2_* && dpkg -i *.deb
-
-# Packages needed to build FRR itself
-# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
-# for more info
-RUN apt-get update && apt-get install -y \
-      bison \
-      chrpath \
-      debhelper \
-      flex \
-      gawk \
-      install-info \
-      libc-ares-dev \
-      libcap-dev \
-      libelf-dev \
-      libjson-c-dev \
-      libpam0g-dev \
-      libpcre3-dev \
-      libpython3-dev \
-      libreadline-dev \
-      librtr-dev \
-      libsnmp-dev \
-      libssh-dev \
-      libsystemd-dev \
-      lsb-base \
-      pkg-config \
-      python3 \
-      python3-dev \
-      python3-pytest \
-      python3-sphinx \
-      texinfo
-
 # Packages needed for hvinfo
 RUN apt-get update && apt-get install -y \
       gnat \
diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
index 4dd3eb20..d919eb0c 100644
--- a/packages/frr/Jenkinsfile
+++ b/packages/frr/Jenkinsfile
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 VyOS maintainers and contributors
+// Copyright (C) 2020-2023 VyOS maintainers and contributors
 //
 // This program is free software; you can redistribute it and/or modify
 // in order to easy exprort images built to "external" world
@@ -21,18 +21,14 @@
 @Library('vyos-build@current')_
 
 def pkgList = [
-    ['name': 'libyang',
-     'scmCommit': 'v2.0.164',
-     'scmUrl': 'https://github.com/CESNET/libyang.git',
-     'buildCmd': 'pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'],
     ['name': 'rtrlib',
      'scmCommit': 'v0.8.0',
      'scmUrl': 'https://github.com/rtrlib/rtrlib.git',
-     'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'],
+     'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; dpkg-buildpackage -uc -us -tc -b'],
     ['name': 'frr',
      'scmCommit': 'stable/8.4',
      'scmUrl': 'https://github.com/FRRouting/frr.git',
-     'buildCmd': 'cd ..; ./build-frr.sh'],
+     'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build-frr.sh'],
 ]
 
 // Start package build using library function from https://github.com/vyos/vyos-build