Skip to content

[release-0.0.99.5] Prepare stable branch (part 1)#1739

Merged
debarshiray merged 4 commits intocontainers:release-0.0.99.5from
debarshiray:wip/rishi/prepare-release-0.0.99.5
Jan 26, 2026
Merged

[release-0.0.99.5] Prepare stable branch (part 1)#1739
debarshiray merged 4 commits intocontainers:release-0.0.99.5from
debarshiray:wip/rishi/prepare-release-0.0.99.5

Conversation

@debarshiray
Copy link
Copy Markdown
Member

@softwarefactory-project-zuul
Copy link
Copy Markdown

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/containers/toolbox for 1739,b6fdb0afa6676cdf64f2731787704851dbca3c62

@debarshiray debarshiray changed the base branch from main to release-0.0.99.5 January 25, 2026 14:15
Detected by https://www.shellcheck.net/:
  Line 1255:
  if ! localtime_target=$(readlink /etc/localtime >/dev/null 2>&3) \
                        ^-- SC2327 (warning): This command substitution
                            will be empty because the command's output
                            gets redirected away.
                                                  ^-- SC2328 (error):
                                                      This redirection
                                                      takes output away
                                                      from the command
                                                      substitution.

See:
https://www.shellcheck.net/wiki/SC2327
https://www.shellcheck.net/wiki/SC2328

Fallout from 8db414d

containers#1701
containers#1739
(cherry picked from commit d32dd5d)
@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello @debarshiray, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request is a preparatory step for the release-0.0.99.5 stable branch, likely in response to a security vulnerability (CVE-2025-65637 / GHSA-4f99-4q7p-p3gh). The changes involve configuring continuous integration jobs to target this new release branch and a substantial cleanup by removing numerous outdated or unmaintained container image definitions for various Linux distributions and versions. Additionally, a subtle bug fix in the core toolbox script improves the handling of symbolic link resolution.

Highlights

  • CI Configuration Update: Several Zuul CI jobs, including unit and system tests for Fedora, have been updated to explicitly run on the new release-0.0.99.5 branch.
  • Container Image Deprecation: A large number of container image definitions and their associated files (Containerfiles, READMEs, package lists) for various Arch, Fedora (f28-f39), RHEL (8.5-9.1), and Ubuntu (16.04-22.04) versions, along with a Busybox test image, have been removed. This indicates a significant cleanup or deprecation of support for these older images.
  • Script Logic Correction: A minor but important fix in the toolbox script's init_container function ensures that the output of the readlink command is correctly captured by removing >/dev/null.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Ignored Files
  • Ignored by pattern: .github/workflows/** (4)
    • .github/workflows/arch-images-pr.yaml
    • .github/workflows/arch-images.yaml
    • .github/workflows/ubuntu-images.yaml
    • .github/workflows/ubuntu-tests.yaml
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@debarshiray debarshiray force-pushed the wip/rishi/prepare-release-0.0.99.5 branch from b6fdb0a to a67f614 Compare January 25, 2026 14:18
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request prepares the release-0.0.99.5 stable branch, primarily to address the security vulnerability GHSA-4f99-4q7p-p3gh. The changes include a fix in the legacy toolbox shell script, updates to the Zuul CI configuration for the new release branch, and a significant removal of container image definitions for various distributions. This cleanup of images for Arch, older Fedora versions, RHEL, and Ubuntu seems intended to reduce the maintenance surface for this stable release. The fix in the toolbox script is a step in the right direction, and I've provided a suggestion to make it even more robust, aligning it with the fix made in the Go implementation.

@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/06d1d88b7e2a4f74acf1a0f15e26e6aa

✔️ unit-test SUCCESS in 1m 41s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 08s
✔️ unit-test-restricted SUCCESS in 1m 40s
system-test-fedora-rawhide FAILURE in 31m 24s
✔️ system-test-fedora-39 SUCCESS in 36m 13s
system-test-fedora-38 NODE_FAILURE Node request 200-0008144816 failed in 0s

DaliborKr and others added 3 commits January 26, 2026 01:52
Bash 5.3.0 changed the error messages shown by its exec built-in [1].

With Bash 5.2.37:
  $ exec /etc
  bash: /etc: Is a directory
  bash: exec: /etc: cannot execute: Is a directory

With Bash 5.3.0:
  $ exec /etc
  bash: /etc: Is a directory

The 'assert' function cannot directly handle compound commands.  So,
those need to be wrapped in 'bash -c "..."' [2].

[1] Bash commit b8c60bc9ca365f82
    See how exec_builtin() handles EX_NOEXEC and EISDIR from
    shell_execve() to avoid printing a duplicate error message.
    https://cgit.git.savannah.gnu.org/cgit/bash.git/commit/?id=b8c60bc9ca365f82

[2] https://github.com/bats-core/bats-assert

containers#1688
containers#1699
containers#1739
(backported from commit 6c98db6)
With the recent expansion of the test suite, it's necessary to increase
the timeout for the Fedora 38 and 39 nodes to prevent the CI from timing
out.

containers#1445
containers#1739
(cherry picked from commit ce66b0b)
Stable branches for old Toolbx releases are only about the toolbox(1)
executable.  It doesn't make sense to have old "stable" versions of the
image definitions, because the registries will have only one set of
images built from the definitions in the main branch, and all supported
versions of toolbox(1) must work with them.

containers#1739
@debarshiray debarshiray changed the title Prepare stable branch release-0.0.99.5 Prepare stable branch release-0.0.99.5 (part 1) Jan 26, 2026
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 26, 2026
This is meant to make the project more searchable on the Internet.  More
and more people have been pointing out that "toolbox" is terribly
difficult to search for, and it's impossible to find any decent
Internet real estate by that name.

containers#1399
containers#1739
(backported from commit c3403da)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 26, 2026
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 26, 2026
@debarshiray debarshiray changed the title Prepare stable branch release-0.0.99.5 (part 1) [release-0.0.99.5] Prepare stable branch (part 1) Jan 26, 2026
@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/f452baff369e4bc79555b941fcb3e56a

✔️ unit-test SUCCESS in 1m 37s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 08s
✔️ unit-test-restricted SUCCESS in 1m 39s
✔️ system-test-fedora-rawhide SUCCESS in 33m 58s
✔️ system-test-fedora-39 SUCCESS in 37m 36s
system-test-fedora-38 NODE_FAILURE Node request 200-0008144985 failed in 0s

@debarshiray
Copy link
Copy Markdown
Member Author

debarshiray commented Jan 26, 2026

Build failed. https://softwarefactory-project.io/zuul/t/local/buildset/06d1d88b7e2a4f74acf1a0f15e26e6aa

✔️ unit-test SUCCESS in 1m 41s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 08s
✔️ unit-test-restricted SUCCESS in 1m 40s
system-test-fedora-rawhide FAILURE in 31m 24s
✔️ system-test-fedora-39 SUCCESS in 36m 13s
system-test-fedora-38 NODE_FAILURE Node request 200-0008144816 failed in 0s

This was due to:

fedora-rawhide | not ok 157 run: Try /etc as a command in 2744ms
fedora-rawhide | # (from function `assert_line' in file test/system/libs/bats-assert/src/assert.bash, line 488,
fedora-rawhide | #  in test file test/system/104-run.bats, line 644)
fedora-rawhide | #   `assert_line --index 1 "bash: line 1: exec: /etc: cannot execute: Is a directory"' failed
fedora-rawhide | #
fedora-rawhide | # -- line differs --
fedora-rawhide | # index    : 1
fedora-rawhide | # expected : bash: line 1: exec: /etc: cannot execute: Is a directory
fedora-rawhide | # actual   : Error: failed to invoke command /etc in container fedora-toolbox-44
fedora-rawhide | # --
fedora-rawhide | #

... which was fixed in commit 6c98db6 in the main branch.

@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/d7b0427b9ff1482b99bf2cfeaf101975

✔️ unit-test SUCCESS in 1m 39s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 14s
✔️ unit-test-restricted SUCCESS in 1m 36s
✔️ system-test-fedora-rawhide SUCCESS in 31m 27s
✔️ system-test-fedora-39 SUCCESS in 36m 41s
system-test-fedora-38 NODE_FAILURE Node request 200-0008144991 failed in 0s

@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/0fa124b658d4498ab071c8dd1e9aa3c8

✔️ unit-test SUCCESS in 1m 44s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 00s
✔️ unit-test-restricted SUCCESS in 1m 38s
✔️ system-test-fedora-rawhide SUCCESS in 32m 41s
✔️ system-test-fedora-39 SUCCESS in 36m 21s
system-test-fedora-38 NODE_FAILURE Node request 200-0008145009 failed in 0s

@debarshiray debarshiray merged commit f2b2a18 into containers:release-0.0.99.5 Jan 26, 2026
1 of 2 checks passed
@debarshiray debarshiray deleted the wip/rishi/prepare-release-0.0.99.5 branch January 26, 2026 20:17
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 26, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1741
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1742
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1742
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
Detected by https://www.shellcheck.net/:
  Line 1255:
  if ! localtime_target=$(readlink /etc/localtime >/dev/null 2>&3) \
                        ^-- SC2327 (warning): This command substitution
                            will be empty because the command's output
                            gets redirected away.
                                                  ^-- SC2328 (error):
                                                      This redirection
                                                      takes output away
                                                      from the command
                                                      substitution.

See:
https://www.shellcheck.net/wiki/SC2327
https://www.shellcheck.net/wiki/SC2328

Fallout from 8db414d

containers#1701
containers#1739
containers#1743
(cherry picked from commit d32dd5d)
(cherry picked from commit a67f614)
debarshiray pushed a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
Bash 5.3.0 changed the error messages shown by its exec built-in [1].

With Bash 5.2.37:
  $ exec /etc
  bash: /etc: Is a directory
  bash: exec: /etc: cannot execute: Is a directory

With Bash 5.3.0:
  $ exec /etc
  bash: /etc: Is a directory

The 'assert' function cannot directly handle compound commands.  So,
those need to be wrapped in 'bash -c "..."' [2].

[1] Bash commit b8c60bc9ca365f82
    See how exec_builtin() handles EX_NOEXEC and EISDIR from
    shell_execve() to avoid printing a duplicate error message.
    https://cgit.git.savannah.gnu.org/cgit/bash.git/commit/?id=b8c60bc9ca365f82

[2] https://github.com/bats-core/bats-assert

containers#1688
containers#1699
containers#1739
containers#1743
(backported from commit 6c98db6)
(cherry picked from commit 0090893)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
Detected by https://www.shellcheck.net/:
  Line 1255:
  if ! localtime_target=$(readlink /etc/localtime >/dev/null 2>&3) \
                        ^-- SC2327 (warning): This command substitution
                            will be empty because the command's output
                            gets redirected away.
                                                  ^-- SC2328 (error):
                                                      This redirection
                                                      takes output away
                                                      from the command
                                                      substitution.

See:
https://www.shellcheck.net/wiki/SC2327
https://www.shellcheck.net/wiki/SC2328

Fallout from 8db414d

containers#1701
containers#1739
containers#1744
(cherry picked from commit d32dd5d)
(cherry picked from commit a67f614)
debarshiray pushed a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
Bash 5.3.0 changed the error messages shown by its exec built-in [1].

With Bash 5.2.37:
  $ exec /etc
  bash: /etc: Is a directory
  bash: exec: /etc: cannot execute: Is a directory

With Bash 5.3.0:
  $ exec /etc
  bash: /etc: Is a directory

The 'assert' function cannot directly handle compound commands.  So,
those need to be wrapped in 'bash -c "..."' [2].

[1] Bash commit b8c60bc9ca365f82
    See how exec_builtin() handles EX_NOEXEC and EISDIR from
    shell_execve() to avoid printing a duplicate error message.
    https://cgit.git.savannah.gnu.org/cgit/bash.git/commit/?id=b8c60bc9ca365f82

[2] https://github.com/bats-core/bats-assert

containers#1688
containers#1699
containers#1739
containers#1744
(backported from commit 6c98db6)
(cherry picked from commit 0090893)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1742
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1742
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1746
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
With the recent expansion of the test suite, it's necessary to increase
the timeout for the Fedora 38 and 39 nodes to prevent the CI from timing
out.

containers#1445
containers#1739
containers#1744
(cherry picked from commit ce66b0b)
(cherry picked from commit 754feea)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 27, 2026
Stable branches for old Toolbx releases are only about the toolbox(1)
executable.  It doesn't make sense to have old "stable" versions of the
image definitions, because the registries will have only one set of
images built from the definitions in the main branch, and all supported
versions of toolbox(1) must work with them.

containers#1739
containers#1744
(cherry picked from commit f2b2a18)
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 28, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1746
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 28, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1748
debarshiray added a commit to debarshiray/toolbox that referenced this pull request Jan 29, 2026
The GitHub Actions workflows for building and publishing the images were
removed because the image definitions were removed from this branch [1].

[1] Commit f2b2a18
    containers@f2b2a18ddef288a3
    containers#1739

containers#1749
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants