From 098966a78ed9621efa4521e21a6c1375f1e774c3 Mon Sep 17 00:00:00 2001 From: Barry O'Donovan Date: Wed, 23 Jan 2019 11:35:14 +0000 Subject: [PATCH] Add routinator to docker --- .env.docker | 10 ++++++++++ .env.example | 2 ++ config/ixp.php | 5 +++++ docker-compose.yml | 9 +++++++++ .../views/api/v4/router/server/bird2/rpki.foil.php | 2 +- tools/docker/containers/routinator/Dockerfile | 11 +++++++++++ 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tools/docker/containers/routinator/Dockerfile diff --git a/.env.docker b/.env.docker index 8ceb675ff..b3850cc84 100644 --- a/.env.docker +++ b/.env.docker @@ -133,3 +133,13 @@ IXP_FE_BETA_CORE_BUNDLES=true # For PHP xdebug, put in the IP address of your host # DOCKER_XDEBUG_CONFIG_REMOTE_HOST=192.0.2.67 +####################################################################################### +# Utility paths + +# See: https://docs.ixpmanager.org/features/irrdb/ +IXP_IRRDB_BGPQ3_PATH=/usr/bin/bgpq3 + +IXP_RPKI_RTR_HOST=172.30.201.31 +IXP_RPKI_RTR_PORT=3323 + + diff --git a/.env.example b/.env.example index b385f1c4c..4080d44ae 100644 --- a/.env.example +++ b/.env.example @@ -236,6 +236,8 @@ DOCTRINE_CACHE_NAMESPACE=IXPMANAGERNAMESPACE # See: https://docs.ixpmanager.org/features/irrdb/ IXP_IRRDB_BGPQ3_PATH=/usr/bin/bgpq3 +IXP_RPKI_RTR_HOST=172.30.201.31 +IXP_RPKI_RTR_PORT=3323 ######################################################################################### diff --git a/config/ixp.php b/config/ixp.php index 49319a5ff..168ddd6c2 100644 --- a/config/ixp.php +++ b/config/ixp.php @@ -124,5 +124,10 @@ ], + 'rpki' => [ + 'host' => env( 'IXP_RPKI_RTR_HOST', '127.0.0.1' ), + 'port' => env( 'IXP_RPKI_RTR_PORT', '3323' ), + ], + ]; diff --git a/docker-compose.yml b/docker-compose.yml index 735c5a6bf..0ac931260 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,6 +94,14 @@ services: - .:/srv/ixpmanager - mrtg-data:/srv/mrtg + routinator: + build: + context: tools/docker/containers/routinator + networks: + ixpmanager: + ipv4_address: 172.30.201.31 + ipv6_address: fd99::31 + rs1: build: context: tools/docker/containers/rs1 @@ -101,6 +109,7 @@ services: - 8881:80 depends_on: - "www" + - "routinator" networks: ixpmanager: ipv4_address: 172.30.201.30 diff --git a/resources/views/api/v4/router/server/bird2/rpki.foil.php b/resources/views/api/v4/router/server/bird2/rpki.foil.php index 2aff53d3f..aa8085349 100644 --- a/resources/views/api/v4/router/server/bird2/rpki.foil.php +++ b/resources/views/api/v4/router/server/bird2/rpki.foil.php @@ -16,7 +16,7 @@ roarouter->protocol() ?> { table t_roa; }; - remote "127.0.0.1" port 3323; + remote "" port ; retry keep 5; refresh keep 30; diff --git a/tools/docker/containers/routinator/Dockerfile b/tools/docker/containers/routinator/Dockerfile new file mode 100644 index 000000000..695e95aed --- /dev/null +++ b/tools/docker/containers/routinator/Dockerfile @@ -0,0 +1,11 @@ +FROM nlnetlabs/routinator:latest + +VOLUME /root/.rpki-cache + + +ADD https://www.arin.net/resources/rpki/arin-rfc7730.tal /root/.rpki-cache/tals/arin.tal + +WORKDIR / + +EXPOSE 3323/tcp +CMD ["routinator", "rtrd", "-a","-l","0.0.0.0:3323"]