Skip to content

[0.11] vendor: github.com/containerd/containerd v1.6.21#3884

Merged
jedevc merged 1 commit intomoby:v0.11from
thaJeztah:vendor_containerd_1.6.21
Jul 21, 2023
Merged

[0.11] vendor: github.com/containerd/containerd v1.6.21#3884
jedevc merged 1 commit intomoby:v0.11from
thaJeztah:vendor_containerd_1.6.21

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented May 19, 2023 •
edited
Loading

release notes: https://github.com/containerd/containerd/releases/tag/v1.6.21

Notable Updates

  • update runc binary to v1.1.7
  • Remove entry for container from container store on error
  • oci: partially restore comment on read-only mounts for uid/gid uses
  • windows: Add ArgsEscaped support for CRI
  • oci: Use WithReadonlyTempMount when adding users/groups
  • archive: consistently respect value of WithSkipDockerManifest

full diff: containerd/containerd@c0efc63...v1.6.21

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented May 19, 2023

Looks like this leads (again) to a digest change?

=== CONT  TestIntegration/TestReproSourceDateEpoch/worker=containerd/frontend=client
    dockerfile_test.go:6607: OCI archive digest="sha256:aa2d0a0f9a6560c267b0c2d41c758ca60386d6001cd687adf837365236507a0a"
    dockerfile_test.go:6608: The digest may change depending on the BuildKit version, the snapshotter configuration, etc.
    dockerfile_test.go:6609: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_test.go:6609
        	            				/src/frontend/dockerfile/run.go:87
        	            				/src/frontend/dockerfile/run.go:196
        	Error:      	Not equal: 
        	            	expected: "sha256:e26093cc8a7524089a1d0136457e6c09a34176e2b2efcf99ac471baa729c7dc9"
        	            	actual  : "sha256:aa2d0a0f9a6560c267b0c2d41c758ca60386d6001cd687adf837365236507a0a"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-sha256:e26093cc8a7524089a1d0136457e6c09a34176e2b2efcf99ac471baa729c7dc9
        	            	+sha256:aa2d0a0f9a6560c267b0c2d41c758ca60386d6001cd687adf837365236507a0a
        	Test:       	TestIntegration/TestReproSourceDateEpoch/worker=containerd/frontend=client

@thaJeztah thaJeztah force-pushed the vendor_containerd_1.6.21 branch from 1395c12 to 23be249 Compare May 19, 2023 11:32
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented May 19, 2023

frontend: fix digest in TestIntegration/TestReproSourceDateEpoch

In the commit message, could you include the PR number (and/or the commit hash) of containerd/containerd#8345 ?

@thaJeztah thaJeztah force-pushed the vendor_containerd_1.6.21 branch 2 times, most recently from 4e2c588 to 4196194 Compare May 22, 2023 09:32
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented May 22, 2023

Thanks for that link! I had to check which of the containerd commits caused the change 😅

Updated, and squashed the commits; I included a link to the containerd change in the commit message

@thaJeztah thaJeztah marked this pull request as ready for review May 22, 2023 09:33
@thaJeztah thaJeztah requested review from AkihiroSuda and jedevc May 22, 2023 09:33
@thaJeztah thaJeztah added this to the v0.11.7 milestone May 22, 2023
@AkihiroSuda AkihiroSuda requested a review from tonistiigi June 5, 2023 06:31
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 5, 2023

@jedevc @tonistiigi PTAL

This was referenced Jul 12, 2023
Closed
Merged
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 17, 2023

I can do a rebase to get a fresh run of CI; hold on

@thaJeztah thaJeztah force-pushed the vendor_containerd_1.6.21 branch from 4196194 to d086027 Compare July 17, 2023 10:28
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 17, 2023

rebased; it's running

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 17, 2023

Ah, dang; I think this branch is broken?

ERROR: The API version 2022-11-02 is not supported by Azurite. Please upgrade Azurite to latest version and retry. If you are using Azurite in Visual Studio, please check you have installed latest Visual Studio patch. Azurite command line parameter "--skipApiVersionCheck" or Visual Studio Code configuration "Skip Api Version Check" can skip this error.

@crazy-max
Copy link
Copy Markdown
Member

crazy-max commented Jul 17, 2023

Ah, dang; I think this branch is broken?

ERROR: The API version 2022-11-02 is not supported by Azurite. Please upgrade Azurite to latest version and retry. If you are using Azurite in Visual Studio, please check you have installed latest Visual Studio patch. Azurite command line parameter "--skipApiVersionCheck" or Visual Studio Code configuration "Skip Api Version Check" can skip this error.

Yes would need to backport #3477 and #3398

@crazy-max crazy-max mentioned this pull request Jul 17, 2023
Merged
@thaJeztah
vendor: github.com/containerd/containerd v1.6.21
f8953fb 
updates the digest in testReproSourceDateEpoch to account for
containerd/containerd@d1f3771

release notes: https://github.com/containerd/containerd/releases/tag/v1.6.21

Notable Updates

- update runc binary to v1.1.7
- Remove entry for container from container store on error
- oci: partially restore comment on read-only mounts for uid/gid uses
- windows: Add ArgsEscaped support for CRI
- oci: Use WithReadonlyTempMount when adding users/groups
- archive: consistently respect value of WithSkipDockerManifest

full diff: containerd/containerd@c0efc63...v1.6.21

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the vendor_containerd_1.6.21 branch from d086027 to f8953fb Compare July 20, 2023 22:01
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 20, 2023

Rebased, because #4030 was merged. Hopefully goes green again now

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 21, 2023

And it's green again! @crazy-max @jedevc PTAL

@jedevc jedevc merged commit 0e454dc into moby:v0.11 Jul 21, 2023
@thaJeztah thaJeztah deleted the vendor_containerd_1.6.21 branch July 21, 2023 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazy-max crazy-max crazy-max approved these changes

@jedevc jedevc jedevc approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v0.11.7

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @AkihiroSuda @crazy-max @jedevc