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

[27.x backport] info: stop printing "Expected" commits #5423

Merged

Conversation

thaJeztah
Copy link
Member

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)

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>
(cherry picked from commit 88ca4e9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 27.2.2 milestone Sep 10, 2024
@thaJeztah thaJeztah self-assigned this Sep 10, 2024
@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.76%. Comparing base (90559a6) to head (4be6b1f).
Report is 1 commits behind head on 27.x.

Additional details and impacted files
@@            Coverage Diff             @@
##             27.x    #5423      +/-   ##
==========================================
- Coverage   59.77%   59.76%   -0.01%     
==========================================
  Files         345      345              
  Lines       23405    23396       -9     
==========================================
- Hits        13990    13983       -7     
+ Misses       8445     8444       -1     
+ Partials      970      969       -1     

@thaJeztah
Copy link
Member Author

Interesting;

#15 0.079 WARNING: fetching https://dl-cdn.alpinelinux.org/alpine/v3.20/main: Permission denied
#15 0.383 ERROR: unable to select packages:
#15 0.383   bash (no such package):
#15 0.383     required by: world[bash]
#15 0.383   clang (no such package):
#15 0.383     required by: world[clang]
#15 0.383   file (no such package):
#15 0.383     required by: world[file]
#15 0.383   git (no such package):
#15 0.383     required by: world[git]
#15 0.383   lld (no such package):
#15 0.383     required by: world[lld]
#15 0.383   llvm (no such package):
#15 0.383     required by: world[llvm]
#15 ERROR: process "/bin/sh -c apk add --no-cache bash clang lld llvm file git" did not complete successfully: exit code: 6

@thaJeztah thaJeztah requested a review from a team September 10, 2024 17:39
@thaJeztah thaJeztah merged commit 05fb576 into docker:27.x Sep 10, 2024
96 checks passed
@thaJeztah thaJeztah deleted the 27.x_backport_info_no_expected_version branch September 10, 2024 17:52
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