diff --git a/Dockerfile.openshift b/Dockerfile.openshift index fad56a14..1e7ae19e 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -37,18 +37,21 @@ COPY --from=frrk8s-builder /frr-k8s/cmd/frr-k8s / COPY --from=frrk8s-builder /frr-k8s/frr-tools/reloader/frr-reloader.sh / COPY --from=frrk8s-builder /frr-k8s/frr-tools/metrics/frr-metrics / COPY --from=frrk8s-builder /frr-k8s/frr-tools/status/frr-status / +COPY --from=frrk8s-builder /frr-k8s/libyang-2.1.148-1.el9.x86_64.rpm / +COPY --from=frrk8s-builder /frr-k8s/frr10-10.4.1-2.el9.x86_64.rpm / ENV PYTHONDONTWRITEBYTECODE yes RUN INSTALL_PKGS=" \ tcpdump libpcap \ iproute iputils strace socat \ - frr \ python3 \ podman-catatonit" && \ yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS -RUN dnf -y update && yum clean all && rm -rf /var/cache/yum/* && rm -rf /var/cache/yum +RUN dnf -y update && \ + yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False /libyang-2.1.148-1.el9.x86_64.rpm /frr10-10.4.1-2.el9.x86_64.rpm && \ + yum clean all && rm -rf /var/cache/yum/* && rm -rf /var/cache/yum # frr.sh is the entry point. This script examines environment # variables to direct operation and configure ovn diff --git a/frr10-10.4.1-2.el9.x86_64.rpm b/frr10-10.4.1-2.el9.x86_64.rpm new file mode 100644 index 00000000..42272d43 Binary files /dev/null and b/frr10-10.4.1-2.el9.x86_64.rpm differ diff --git a/libyang-2.1.148-1.el9.x86_64.rpm b/libyang-2.1.148-1.el9.x86_64.rpm new file mode 100644 index 00000000..f081f7ed Binary files /dev/null and b/libyang-2.1.148-1.el9.x86_64.rpm differ