diff options
| -rw-r--r-- | .gitmodules | 7 | ||||
| -rw-r--r-- | docker/Dockerfile | 37 | ||||
| m--------- | packages/lldpd | 0 | ||||
| m--------- | packages/pdns-recursor | 0 | ||||
| -rwxr-xr-x | scripts/build-submodules | 2 |
5 files changed, 38 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index dd608357..55e8e1b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -248,4 +248,9 @@ [submodule "packages/ipaddrcheck"] path = packages/ipaddrcheck url = https://github.com/vyos/ipaddrcheck.git - branch = master +[submodule "packages/lldpd"] + path = packages/lldpd + url = https://github.com/vincentbernat/lldpd.git +[submodule "packages/pdns-recursor"] + path = packages/pdns-recursor + url = https://salsa.debian.org/dns-team/pdns-recursor.git diff --git a/docker/Dockerfile b/docker/Dockerfile index 38dea015..0b03a8e5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -228,18 +228,12 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - git clone https://github.com/vyos/libvyosconfig && \ + git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && \ git checkout a9817fa26c1be1 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -# Packages needed for ipaddrcheck -RUN apt-get update && apt-get install -y \ - libpcre3-dev \ - libcidr-dev \ - check - # Packages needed for hvinfo RUN apt-get update && apt-get install -y \ gnat \ @@ -253,6 +247,35 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ golang +# Packages needed for ipaddrcheck +RUN apt-get update && apt-get install -y \ + check +# As there is no Debian Jessie/Stretch package for libcidr available but this +# is required for ipaddrcheck we have to build it from source +RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ + cd analytics-libcidr && \ + git checkout 026c611d90a1 && \ + dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../libcidr*.deb + +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for pdns-recursor +RUN apt-get update && apt-get install -y \ + libboost-context-dev \ + libboost-dev \ + libboost-program-options-dev \ + libboost-test-dev \ + liblua5.2-dev \ + libprotobuf-dev \ + libsodium-dev \ + protobuf-compiler \ + publicsuffix \ + ragel + # 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 && apt-get install -y -t stretch live-build && \ diff --git a/packages/lldpd b/packages/lldpd new file mode 160000 +Subproject adbb26bc0a49d083472d24762255ff48bd001e4 diff --git a/packages/pdns-recursor b/packages/pdns-recursor new file mode 160000 +Subproject 28af51a3942875f0896fab2ea5945ded4a19197 diff --git a/scripts/build-submodules b/scripts/build-submodules index ae0c1c09..e6e9cda3 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -261,6 +261,7 @@ for PKG in mdns-repeater \ hvinfo \ igmpproxy \ ipaddrcheck \ + lldpd \ libvyosconfig \ vyatta-bash \ vyatta-biosdevname \ @@ -303,6 +304,7 @@ for PKG in mdns-repeater \ vyos-opennhrp \ vyos-salt-minion \ vyos-strongswan \ + vyos-vmwaretools-scripts \ vyos-world \ vyos-1x \ ; do |