From be3a61a93a4ad355b2c6932c3e2cff47e1889043 Mon Sep 17 00:00:00 2001 From: David Schmitz <schmitz@lrz.de> Date: Tue, 2 May 2023 13:14:40 +0000 Subject: [PATCH] Dockerfiles.d/Dockerfile.vnet_router* --- Dockerfiles.d/Dockerfile.vnet_router0a | 4 ++-- Dockerfiles.d/Dockerfile.vnet_router1 | 2 +- Dockerfiles.d/Dockerfile.vnet_router2.debian | 4 ++-- Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp | 6 +++--- Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp1 | 6 +++--- Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2 | 6 +++--- Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2.topo2 | 6 +++--- Dockerfiles.d/Dockerfile.vnet_router2.old | 4 ++-- Dockerfiles.d/Dockerfile.vnet_router2.ubuntu | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfiles.d/Dockerfile.vnet_router0a b/Dockerfiles.d/Dockerfile.vnet_router0a index 74f8ee75..343fff01 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router0a +++ b/Dockerfiles.d/Dockerfile.vnet_router0a @@ -32,9 +32,9 @@ FROM ubuntu:18.04 # 2. install all dependencies in advance RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog # 3. copy yang config RUN mkdir -p /opt/dev diff --git a/Dockerfiles.d/Dockerfile.vnet_router1 b/Dockerfiles.d/Dockerfile.vnet_router1 index 3d112b56..32dac9fa 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router1 +++ b/Dockerfiles.d/Dockerfile.vnet_router1 @@ -59,7 +59,7 @@ FROM cejkat/fod-router # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) COPY vnet_router/fod_vnet_router / diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.debian b/Dockerfiles.d/Dockerfile.vnet_router2.debian index 3e084577..b1d0ce60 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.debian +++ b/Dockerfiles.d/Dockerfile.vnet_router2.debian @@ -61,9 +61,9 @@ FROM debian:buster # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp index cfc11890..d051f021 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp +++ b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp @@ -61,12 +61,12 @@ FROM debian:bullseye # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog #RUN apt-get -qqy install exabgp quagga bird -RUN apt-get -qqy install exabgp bird2 +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install exabgp bird2 # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp1 b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp1 index 926182a7..a587fcb4 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp1 +++ b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp1 @@ -61,11 +61,11 @@ FROM debian:buster # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog -RUN apt-get -qqy install exabgp quagga bird +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install exabgp quagga bird # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2 b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2 index 1e3e3015..b5ebd5b8 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2 +++ b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2 @@ -61,12 +61,12 @@ FROM debian:bullseye # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog #RUN apt-get -qqy install exabgp quagga bird -RUN apt-get -qqy install exabgp bird2 +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install exabgp bird2 # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2.topo2 b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2.topo2 index 2ae4d3af..6c95780c 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2.topo2 +++ b/Dockerfiles.d/Dockerfile.vnet_router2.debian.exabgp2.topo2 @@ -63,12 +63,12 @@ FROM debian:bullseye # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog #RUN apt-get -qqy install exabgp quagga bird -RUN apt-get -qqy install exabgp bird2 +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install exabgp bird2 # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.old b/Dockerfiles.d/Dockerfile.vnet_router2.old index d1fac82d..bffa1630 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.old +++ b/Dockerfiles.d/Dockerfile.vnet_router2.old @@ -59,9 +59,9 @@ FROM cejkat/fod-router # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) COPY vnet_router/configuration.yang /opt/dev/ diff --git a/Dockerfiles.d/Dockerfile.vnet_router2.ubuntu b/Dockerfiles.d/Dockerfile.vnet_router2.ubuntu index e5cbb3e1..41b1b1f0 100644 --- a/Dockerfiles.d/Dockerfile.vnet_router2.ubuntu +++ b/Dockerfiles.d/Dockerfile.vnet_router2.ubuntu @@ -60,9 +60,9 @@ FROM ubuntu:18.04 # 2. install all dependencies in advance (/fod_vnet_router --init.sysstart will check again and might install anything still missing) RUN apt-get -qqy update -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install mininet iptables iproute2 tcpdump tshark iputils-ping iputils-tracepath hping3 gawk sshpass lsof strace snmpd snmp vim less -RUN DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog +RUN apt-get -qqy update && DEBIAN_FRONTEND="noninteractive" apt-get -qqy install netconfd yangcli socat openssh-server rsyslog # 3. copy vnet_router management script + snmp feeder pass_persisttest_bgpflowspec (+ pass_persisttest only for testing/demonstration) # 3. copy yang config -- GitLab