fix: frr for rhel.

dist/rootfs/var/openlan/script/frr-server

@@ -16,7 +16,7 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 def do_vtyshell(command):
-    proc = subprocess.Popen(['vtysh', '-c', command], stdout=subprocess.PIPE, text=True)
+    proc = subprocess.Popen(['vtysh', '-c', command], stdout=subprocess.PIPE)
     stdout, stderr = proc.communicate()
     if proc.returncode == 0:
         return True, stdout

dist/rootfs/var/openlan/script/install.sh

@@ -33,7 +33,7 @@ function requires() {
     yum update -y
     yum install -y epel-release
     yum install -y openssl net-tools iptables iputils iperf3 tcpdump
-    yum install -y openvpn dnsmasq bridge-utils ipset procps wget frr
+    yum install -y openvpn dnsmasq bridge-utils ipset procps wget
   elif [ "$sys"x == "debian"x ]; then
     apt-get update -y
     apt install -y net-tools iptables iproute2 tcpdump ca-certificates iperf3
@@ -43,6 +43,9 @@ function requires() {
   if [ "$sys"x == "redhat"x ]; then
     wget -O /tmp/libreswan-4.10-1.el7.x86_64.rpm https://github.com/luscis/packages/raw/main/redhat/centos7/libreswan-4.10-1.el7.x86_64.rpm
     yum install -y /tmp/libreswan-4.10-1.el7.x86_64.rpm || yum install -y libreswan
+    wget -O /tmp/frr-stable-repo.el7.noarch.rpm https://rpm.frrouting.org/repo/frr-stable-repo.el7.noarch.rpm
+    yum install -y /tmp/frr-stable-repo.el7.noarch.rpm
+    yum install -y frr frr-pythontools
   elif [ "$sys"x == "debian"x ]; then
     wget -O /tmp/libreswan_4.10-1_amd64.deb https://github.com/luscis/packages/raw/main/debian/bullseye/libreswan_4.10-1_amd64.deb
     apt install -y /tmp/libreswan_4.10-1_amd64.deb || apt install -y libreswan

docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services:
   ipsec:
     restart: always
-    image: "luscis/openlan:latest.x86_64"
+    image: "luscis/openlan:latest.amd64.deb"
     privileged: true
     network_mode: host
     entrypoint: ["/var/openlan/script/ipsec.sh"]
@@ -11,7 +11,7 @@ services:
       - /opt/openlan/run/pluto:/run/pluto
   frr:
     restart: always
-    image: "luscis/openlan:latest.x86_64"
+    image: "luscis/openlan:latest.amd64.deb"
     network_mode: host
     privileged: true
     entrypoint: ["/var/openlan/script/frr.sh"]
@@ -20,7 +20,7 @@ services:
       - /opt/openlan/var/openlan/frr:/var/openlan/frr
   switch:
     restart: always
-    image: "luscis/openlan:latest.x86_64"
+    image: "luscis/openlan:latest.amd64.deb"
     privileged: true
     network_mode: host
     entrypoint: ["/var/openlan/script/switch.sh", "start"]
@@ -35,7 +35,7 @@ services:
       - frr
   proxy:
     restart: always
-    image: "luscis/openlan:latest.x86_64"
+    image: "luscis/openlan:latest.amd64.deb"
     network_mode: host
     entrypoint: ["/usr/bin/openlan-proxy", "-conf", "/etc/openlan/proxy.json", "-log:file", "/dev/null"]
     volumes: