From f1248ab0efeaa810f8c628d7220c50e33fc0b205 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahathaway@microsoft.com>
Date: Fri, 22 Nov 2024 11:51:20 -0800
Subject: [PATCH 1/4] Add iproute2 to sb dockerfiles

---
 src/almalinux/8/source-build/amd64/Dockerfile | 1 +
 src/alpine/3.19/amd64/Dockerfile              | 1 +
 src/alpine/3.20/amd64/Dockerfile              | 1 +
 src/centos/stream9/amd64/Dockerfile           | 1 +
 src/fedora/41/amd64/Dockerfile                | 1 +
 src/ubuntu/24.04/Dockerfile                   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/almalinux/8/source-build/amd64/Dockerfile b/src/almalinux/8/source-build/amd64/Dockerfile
index 9837feda..7b2cfea9 100644
--- a/src/almalinux/8/source-build/amd64/Dockerfile
+++ b/src/almalinux/8/source-build/amd64/Dockerfile
@@ -19,6 +19,7 @@ RUN dnf upgrade --refresh -y \
         gdb \
         git \
         glibc-langpack-en \
+        iproute2 \
         jq \
         krb5-devel \
         libcurl-devel \
diff --git a/src/alpine/3.19/amd64/Dockerfile b/src/alpine/3.19/amd64/Dockerfile
index eae7b9e5..60bb54df 100644
--- a/src/alpine/3.19/amd64/Dockerfile
+++ b/src/alpine/3.19/amd64/Dockerfile
@@ -22,6 +22,7 @@ RUN apk add --upgrade --no-cache \
         icu-data-full \
         icu-dev \
         icu-libs \
+        iproute2 \
         jq \
         krb5-dev \
         krb5-libs \
diff --git a/src/alpine/3.20/amd64/Dockerfile b/src/alpine/3.20/amd64/Dockerfile
index 307c9faf..f0605d12 100644
--- a/src/alpine/3.20/amd64/Dockerfile
+++ b/src/alpine/3.20/amd64/Dockerfile
@@ -22,6 +22,7 @@ RUN apk add --upgrade --no-cache \
         icu-data-full \
         icu-dev \
         icu-libs \
+        iproute2 \
         jq \
         krb5-dev \
         libtool \
diff --git a/src/centos/stream9/amd64/Dockerfile b/src/centos/stream9/amd64/Dockerfile
index 51903e90..94fa2722 100644
--- a/src/centos/stream9/amd64/Dockerfile
+++ b/src/centos/stream9/amd64/Dockerfile
@@ -27,6 +27,7 @@ RUN dnf upgrade --refresh -y \
         git \
         glibc-langpack-en \
         hostname \
+        iproute2 \
         jq \
         krb5-devel \
         libcurl-devel \
diff --git a/src/fedora/41/amd64/Dockerfile b/src/fedora/41/amd64/Dockerfile
index 14e39c9e..6a9b6208 100644
--- a/src/fedora/41/amd64/Dockerfile
+++ b/src/fedora/41/amd64/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade --refresh -y \
         clang \
         cmake \
         dnf-plugins-core \
+        iproute2 \
         findutils \
         gdb \
         glibc-langpack-en \
diff --git a/src/ubuntu/24.04/Dockerfile b/src/ubuntu/24.04/Dockerfile
index 0deeb315..f2cd46e5 100644
--- a/src/ubuntu/24.04/Dockerfile
+++ b/src/ubuntu/24.04/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get update \
         clang-14 \
         cmake \
         gdb \
+        iproute2 \
         liblldb-14-dev \
         lldb-14 \
         llvm-14 \

From d94ede9c5a38926a01c32bfd7ad6a008ca9c099f Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahathaway@microsoft.com>
Date: Fri, 22 Nov 2024 12:39:53 -0800
Subject: [PATCH 2/4] Use iproute on fedora

---
 src/fedora/41/amd64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fedora/41/amd64/Dockerfile b/src/fedora/41/amd64/Dockerfile
index 6a9b6208..69ae5b2f 100644
--- a/src/fedora/41/amd64/Dockerfile
+++ b/src/fedora/41/amd64/Dockerfile
@@ -7,7 +7,6 @@ RUN dnf upgrade --refresh -y \
         clang \
         cmake \
         dnf-plugins-core \
-        iproute2 \
         findutils \
         gdb \
         glibc-langpack-en \
@@ -45,6 +44,7 @@ RUN dnf upgrade --refresh -y \
         uuid-devel \
         zlib-devel \
         # Dependencies for VMR/source-build tests
+        iproute \
         elfutils \
         file \
         # Dependencies to support globalization

From 1d267563575b1000f9592021b781dcae4aa31f18 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahathaway@microsoft.com>
Date: Fri, 22 Nov 2024 13:24:36 -0800
Subject: [PATCH 3/4] Use iproute for centos and alma linux

---
 src/almalinux/8/source-build/amd64/Dockerfile | 2 +-
 src/centos/stream9/amd64/Dockerfile           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/almalinux/8/source-build/amd64/Dockerfile b/src/almalinux/8/source-build/amd64/Dockerfile
index 7b2cfea9..91ef0ddb 100644
--- a/src/almalinux/8/source-build/amd64/Dockerfile
+++ b/src/almalinux/8/source-build/amd64/Dockerfile
@@ -19,7 +19,7 @@ RUN dnf upgrade --refresh -y \
         gdb \
         git \
         glibc-langpack-en \
-        iproute2 \
+        iproute \
         jq \
         krb5-devel \
         libcurl-devel \
diff --git a/src/centos/stream9/amd64/Dockerfile b/src/centos/stream9/amd64/Dockerfile
index 94fa2722..0be3d054 100644
--- a/src/centos/stream9/amd64/Dockerfile
+++ b/src/centos/stream9/amd64/Dockerfile
@@ -27,7 +27,7 @@ RUN dnf upgrade --refresh -y \
         git \
         glibc-langpack-en \
         hostname \
-        iproute2 \
+        iproute \
         jq \
         krb5-devel \
         libcurl-devel \

From 4882376a81364a6797df14a3edf8385e61f9a305 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:27:51 -0800
Subject: [PATCH 4/4] Update Dockerfile

---
 src/ubuntu/24.04/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ubuntu/24.04/Dockerfile b/src/ubuntu/24.04/Dockerfile
index f2cd46e5..9b8b6850 100644
--- a/src/ubuntu/24.04/Dockerfile
+++ b/src/ubuntu/24.04/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
         clang-14 \
         cmake \
         gdb \
-        iproute2 \
         liblldb-14-dev \
         lldb-14 \
         llvm-14 \
@@ -27,6 +26,7 @@ RUN apt-get update \
     && apt-get install -y \
         curl \
         git \
+        iproute2 \
         npm \
         zip \
     && rm -rf /var/lib/apt/lists/*