Merge branch 'master' into wireguard

This commit is contained in:
Manevolent 2021-09-21 16:07:12 -06:00
commit dd831a1d96
No known key found for this signature in database
GPG Key ID: 2E9B7592DFA4F344

View File

@ -4,6 +4,8 @@ MAINTAINER Pier Carlo Chiodi <pierky@pierky.com>
EXPOSE 179 EXPOSE 179
ENV BIRD_VERSION 2.0.8
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
autoconf \ autoconf \
git \ git \
@ -18,20 +20,14 @@ RUN apt-get update && apt-get install -y \
libssh-dev libssh-dev
WORKDIR /root WORKDIR /root
RUN curl -O -L https://bird.network.cz/download/bird-2.0.7.tar.gz RUN curl -O -L https://bird.network.cz/download/bird-$BIRD_VERSION.tar.gz
RUN tar -xvzf bird-2.0.7.tar.gz RUN tar -xvzf bird-$BIRD_VERSION.tar.gz
# This directory must be mounted as a local volume with '-v `pwd`/bird:/etc/bird:rw' docker's command line option. # This directory must be mounted as a local volume with '-v `pwd`/bird:/etc/bird:rw' docker's command line option.
# The host's file at `pwd`/bird/bird.conf is used as the configuration file for BIRD. # The host's file at `pwd`/bird/bird.conf is used as the configuration file for BIRD.
RUN mkdir /etc/bird RUN mkdir /etc/bird
RUN cd bird-2.0.7 && \ RUN cd bird-$BIRD_VERSION && \
autoreconf && \
./configure && \
make && \
make install
RUN cd bird-2.0.7 && \
autoreconf && \ autoreconf && \
./configure --enable-ipv6 --enable-libssh && \ ./configure --enable-ipv6 --enable-libssh && \
make && \ make && \