From cb31af5bdefacde48925cd9e9b682403ee652b32 Mon Sep 17 00:00:00 2001
From: Dileep Yavanamandha <dileepy@microsoft.com>
Date: Fri, 8 May 2026 13:29:28 -0700
Subject: [PATCH] Add bubblewrap and socat to common-utils

---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 6 ++++++
 test/common-utils/test.sh                  | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 4ebbd3074..92d47fc3c 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.7",
+    "version": "2.5.8",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 3f6b13477..706bb4d1e 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -34,6 +34,7 @@ install_debian_packages() {
         package_list="${package_list} \
         apt-utils \
         bash-completion \
+        bubblewrap \
         openssh-client \
         gnupg2 \
         dirmngr \
@@ -70,6 +71,7 @@ install_debian_packages() {
         locales \
         sudo \
         ncdu \
+        socat \
         man-db \
         strace \
         manpages \
@@ -181,6 +183,7 @@ install_redhat_packages() {
         package_list="${package_list} \
             gawk \
             bash-completion \
+            bubblewrap \
             openssh-clients \
             gnupg2 \
             iproute \
@@ -203,6 +206,7 @@ install_redhat_packages() {
             libicu \
             zlib \
             sudo \
+            socat \
             sed \
             grep \
             which \
@@ -273,6 +277,7 @@ install_alpine_packages() {
         apk add --no-cache \
             openssh-client \
             bash-completion \
+            bubblewrap \
             gnupg \
             procps \
             lsof \
@@ -299,6 +304,7 @@ install_alpine_packages() {
             userspace-rcu \
             zlib \
             sudo \
+            socat \
             coreutils \
             sed \
             grep \
diff --git a/test/common-utils/test.sh b/test/common-utils/test.sh
index 5e16a33c7..46cb119be 100755
--- a/test/common-utils/test.sh
+++ b/test/common-utils/test.sh
@@ -10,6 +10,8 @@ check "jq" jq  --version
 check "curl" curl  --version
 check "git" git  --version
 check "zsh" zsh --version
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 check "ps" ps --version
 check "Oh My Zsh! theme" test -e $HOME/.oh-my-zsh/custom/themes/devcontainers.zsh-theme
 check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-theme