From 100645d54008ba655ac77c6a3c8ea0c898980271 Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 08:38:47 +0000 Subject: [PATCH 1/7] Initial plan From 18fac10ad07d9c7ad84d5064a2d65f731b3bb2dc Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 08:41:37 +0000 Subject: [PATCH 2/7] Guard unavailable RPM iptables package Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/main.sh | 5 ++--- test/common-utils/scenarios.json | 7 +++++++ test/common-utils/ubi-10-minimal.sh | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 test/common-utils/ubi-10-minimal.sh diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 6f7d890e1..ec549b564 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.7.1", + "version": "2.7.2", "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 200687920..89570360c 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -223,7 +223,6 @@ install_redhat_packages() { man-db \ strace \ util-linux \ - iptables \ socat" # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' @@ -253,9 +252,9 @@ install_redhat_packages() { remove_epel="true" fi - # Sandboxing packages are not available in all RPM repositories. + # Optional packages are not available in all RPM repositories. local sandbox_package sandbox_package_info sandbox_package_available - for sandbox_package in bubblewrap slirp4netns; do + for sandbox_package in bubblewrap slirp4netns iptables; do sandbox_package_available="false" if [ "${install_cmd}" = "microdnf" ]; then sandbox_package_info="$(${install_cmd} repoquery "${sandbox_package}")" diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json index 8fcc68c59..324a458c9 100644 --- a/test/common-utils/scenarios.json +++ b/test/common-utils/scenarios.json @@ -339,5 +339,12 @@ "features": { "common-utils": {} } + }, + "ubi-10-minimal": { + "image": "registry.access.redhat.com/ubi10/ubi-minimal:10.0", + "remoteUser": "devcontainer", + "features": { + "common-utils": {} + } } } diff --git a/test/common-utils/ubi-10-minimal.sh b/test/common-utils/ubi-10-minimal.sh new file mode 100644 index 000000000..c84a61f2a --- /dev/null +++ b/test/common-utils/ubi-10-minimal.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + +# Optional: Import test library +source dev-container-features-test-lib + +# Definition specific tests +. /etc/os-release +check "non-root user" test "$(whoami)" = "devcontainer" +check "distro" test "${PLATFORM_ID}" = "platform:el10" +check "curl" curl --version +check "jq" jq --version +check "util-linux" unshare --version + +# Report result +reportResults From b94efa491a09f09e3d795e8bf311c8b3b58c8958 Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 08:42:27 +0000 Subject: [PATCH 3/7] Document optional RPM iptables package Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md index 041743887..9250c65c9 100644 --- a/src/common-utils/NOTES.md +++ b/src/common-utils/NOTES.md @@ -12,7 +12,7 @@ In addition to the common CLI tools (curl, wget, git, jq, nano, vim, etc.), this - **iptables** - tools for configuring packet filtering and NAT rules used by sandbox networking. - **socat** — a multipurpose relay for bidirectional data transfer between two independent data channels (e.g., sockets, files, pipes). -On RPM-based distributions, bubblewrap and slirp4netns are installed only when available in the configured repositories. +On RPM-based distributions, bubblewrap, slirp4netns, and iptables are installed only when available in the configured repositories. ## Using with dev container images From 9e66754959ec6a2d70a1361ec6a0a0912c61386f Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:41:01 +0000 Subject: [PATCH 4/7] Use microdnf resolver for optional packages Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/main.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index ec549b564..420077e43 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.7.2", + "version": "2.7.3", "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 89570360c..bef9cf6a2 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -257,8 +257,7 @@ install_redhat_packages() { for sandbox_package in bubblewrap slirp4netns iptables; do sandbox_package_available="false" if [ "${install_cmd}" = "microdnf" ]; then - sandbox_package_info="$(${install_cmd} repoquery "${sandbox_package}")" - if grep -q "^${sandbox_package}-" <<< "${sandbox_package_info}"; then + if rpm -q "${sandbox_package}" >/dev/null 2>&1 || ${install_cmd} install --assumeno "${sandbox_package}" >/dev/null 2>&1; then sandbox_package_available="true" fi elif ${install_cmd} -q list "${sandbox_package}" >/dev/null 2>&1; then From ac4e3695c616489dd60a446de1ae0a428bc420d0 Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:26:34 +0000 Subject: [PATCH 5/7] Use direct microdnf installs for optional packages Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/main.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 420077e43..0030817b8 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.7.3", + "version": "2.7.4", "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 bef9cf6a2..886e3b870 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -253,11 +253,11 @@ install_redhat_packages() { fi # Optional packages are not available in all RPM repositories. - local sandbox_package sandbox_package_info sandbox_package_available + local sandbox_package sandbox_package_available for sandbox_package in bubblewrap slirp4netns iptables; do sandbox_package_available="false" if [ "${install_cmd}" = "microdnf" ]; then - if rpm -q "${sandbox_package}" >/dev/null 2>&1 || ${install_cmd} install --assumeno "${sandbox_package}" >/dev/null 2>&1; then + if rpm -q "${sandbox_package}" >/dev/null 2>&1 || ${install_cmd} -y install "${sandbox_package}"; then sandbox_package_available="true" fi elif ${install_cmd} -q list "${sandbox_package}" >/dev/null 2>&1; then From 02625584df2e1817c58796c122a00a2558600edc Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:33:09 +0000 Subject: [PATCH 6/7] Restore consistent RPM package transaction Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/NOTES.md | 2 +- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/main.sh | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md index 9250c65c9..c0618e3e9 100644 --- a/src/common-utils/NOTES.md +++ b/src/common-utils/NOTES.md @@ -12,7 +12,7 @@ In addition to the common CLI tools (curl, wget, git, jq, nano, vim, etc.), this - **iptables** - tools for configuring packet filtering and NAT rules used by sandbox networking. - **socat** — a multipurpose relay for bidirectional data transfer between two independent data channels (e.g., sockets, files, pipes). -On RPM-based distributions, bubblewrap, slirp4netns, and iptables are installed only when available in the configured repositories. +On RPM-based distributions, bubblewrap and slirp4netns are installed only when available in the configured repositories. iptables is not installed on EL10 images because it is not available in UBI 10 minimal. ## Using with dev container images diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 0030817b8..05ec01b53 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.7.4", + "version": "2.7.5", "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 886e3b870..852a87cd8 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -225,6 +225,11 @@ install_redhat_packages() { util-linux \ socat" + # UBI 10 minimal does not provide iptables. + if [[ "${ID}" != "rhel" || "${VERSION_ID}" != 10* ]]; then + package_list="${package_list} iptables" + fi + # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' # Install 'curl' for every OS except this rockylinux:9 if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then @@ -252,12 +257,13 @@ install_redhat_packages() { remove_epel="true" fi - # Optional packages are not available in all RPM repositories. - local sandbox_package sandbox_package_available - for sandbox_package in bubblewrap slirp4netns iptables; do + # Sandboxing packages are not available in all RPM repositories. + local sandbox_package sandbox_package_info sandbox_package_available + for sandbox_package in bubblewrap slirp4netns; do sandbox_package_available="false" if [ "${install_cmd}" = "microdnf" ]; then - if rpm -q "${sandbox_package}" >/dev/null 2>&1 || ${install_cmd} -y install "${sandbox_package}"; then + sandbox_package_info="$(${install_cmd} repoquery "${sandbox_package}")" + if grep -q "^${sandbox_package}-" <<< "${sandbox_package_info}"; then sandbox_package_available="true" fi elif ${install_cmd} -q list "${sandbox_package}" >/dev/null 2>&1; then From e3f23e2c4548dbeee898077e0e06ea1421bbc9ee Mon Sep 17 00:00:00 2001 From: v-Kaniska244 <186041440+v-Kaniska244@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:10:07 +0000 Subject: [PATCH 7/7] Set common-utils version to 2.7.2 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/common-utils/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 05ec01b53..ec549b564 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.7.5", + "version": "2.7.2", "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.",