diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
| commit | 0072d11f3431165240656edf6ade473554b8747e (patch) | |
| tree | 6c53bbbf0d3a4a3ad70846aae50995dc184cc5a5 /misc | |
| parent | 2e95d269d6bd42372d3273264e14775242b0744d (diff) | |
| parent | db9153e216b6f1847ac9cdf170b1d14c04552e41 (diff) | |
Merge branch 'ballygarvan' into HEAD
Replacing the old 3.0-alpha0 cork mechanism with another one inside the
routing table. This version should be simpler and also quite clear what
it does, why and when.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bird.spec | 2 | ||||
| -rw-r--r-- | misc/docker/ubuntu-21.10-amd64/Dockerfile (renamed from misc/docker/ubuntu-20.10-amd64/Dockerfile) | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/misc/bird.spec b/misc/bird.spec index 26b43011..c3fdd7d6 100644 --- a/misc/bird.spec +++ b/misc/bird.spec @@ -1,6 +1,6 @@ Summary: BIRD Internet Routing Daemon Name: bird -Version: 2.0.8 +Version: 2.0.10 Release: 1 Copyright: GPL Group: Networking/Daemons diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-21.10-amd64/Dockerfile index 19cb1b85..aa0987b6 100644 --- a/misc/docker/ubuntu-20.10-amd64/Dockerfile +++ b/misc/docker/ubuntu-21.10-amd64/Dockerfile @@ -1,9 +1,10 @@ -FROM ubuntu:20.10 +FROM ubuntu:21.10 ENV DEBIAN_FRONTEND=noninteractive RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade -RUN apt-get -y install \ +RUN apt-get -y --no-install-recommends install \ + tzdata \ build-essential \ flex \ bison \ |