Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

info: stop printing "Expected" commits #5422

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 10, 2024

relates to:

The Commit type was introduced in moby/moby@2790ac6, to assist triaging issues that were reported with an incorrect version of runc or containerd. At the time, both runc and containerd were not yet stable, and had to be built from a specific commit to guarantee compatibility.

We encountered various situations where unexpected (and incompatible) versions of those binaries were packaged, resulting in hard to trace bug-reports. For those situations, a "expected" version was set at compile time, to indicate if the version installed was different from the expected version;

docker info
...
runc version: a592beb5bc4c4092b1b1bac971afed27687340c5 (expected: 69663f0bd4b60df09991c08812a60108003fa340)

Both runc and containerd are stable now, and docker 19.03 and up set the expected version to the actual version since moby/moby@c65f0bd and 23.0 did the same for the init binary moby/moby@b585c64, to prevent the CLI from reporting "unexpected version".

In short; the Expected fields no longer serves a real purpose, so we should no longer print it.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link

codecov-commenter commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.77%. Comparing base (a464a63) to head (88ca4e9).
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5422      +/-   ##
==========================================
- Coverage   59.78%   59.77%   -0.01%     
==========================================
  Files         345      345              
  Lines       23394    23385       -9     
==========================================
- Hits        13985    13978       -7     
+ Misses       8438     8437       -1     
+ Partials      971      970       -1     

The `Commit` type was introduced in moby/moby@2790ac6,
to assist triaging issues that were reported with an incorrect version of
runc or containerd. At the time, both `runc` and `containerd` were not yet
stable, and had to be built from a specific commit to guarantee compatibility.

We encountered various situations where unexpected (and incompatible) versions
of those binaries were packaged, resulting in hard to trace bug-reports.
For those situations, a "expected" version was set at compile time, to
indicate if the version installed was different from the expected version;

    docker info
    ...
    runc version: a592beb5bc4c4092b1b1bac971afed27687340c5 (expected: 69663f0bd4b60df09991c08812a60108003fa340)

Both `runc` and `containerd` are stable now, and docker 19.03 and up set the
expected version to the actual version since moby/moby@c65f0bd
and 23.0 did the same for the `init` binary moby/moby@b585c64,
to prevent the CLI from reporting "unexpected version".

In short; the `Expected` fields no longer serves a real purpose, so we should
no longer print it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Contributor

@krissetto krissetto left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 6965f40 into docker:master Sep 10, 2024
98 checks passed
@thaJeztah thaJeztah deleted the info_no_expected_version branch September 10, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants