Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Upgrade Containerd in main from 1.5.4 to 1.5.5 #1148

Merged
merged 1 commit into from
Aug 13, 2021
Merged

Upgrade Containerd in main from 1.5.4 to 1.5.5 #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app-emulation/containerd/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6
DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
DIST containerd-1.5.5.tar.gz 7711631 BLAKE2B 3777db6e7348500b27e8cff799d977d556d1956c097831c3a532791c629997c1f72b2f55db142b5659a253750422ede23a4179633b54226be1b95d96ac26367b SHA512 8ee5aa1d35e76238fd8707bff6b7eedb7931e6489d49b6907a8e190b076fe6fd95ae5e85ecea1605adb7fcd4f3ae0e926696f1d2f3c0d12b61e6df906929b9eb
0 ...ion/containerd/containerd-1.5.4-r1.ebuild → ...lation/containerd/containerd-1.5.5.ebuild
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app-emulation/containerd/containerd-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="69a4a55aa42353c71aae40e5bb27a412d8e3149b"
CONTAINERD_COMMIT="d9768bd283183fc51cc587249530adc3fa43ebbb"
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't get where these commits come from. For both 69a4a55aa42353c71aae40e5bb27a412d8e3149b and d9768bd283183fc51cc587249530adc3fa43ebbb I get 404 on github.

Copy link
Contributor

Choose a reason for hiding this comment

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

$ git ls-remote https://github.com/containerd/containerd | tail -n4
69a4a55aa42353c71aae40e5bb27a412d8e3149b        refs/tags/v1.5.4
69107e47a62e1d690afa2b9b1d43f8ece3ff4483        refs/tags/v1.5.4^{}
d9768bd283183fc51cc587249530adc3fa43ebbb        refs/tags/v1.5.5
72cec4be58a9eb6b2910f5d10f1c01ca47d231c0        refs/tags/v1.5.5^{}

they are the hashes of the tags themselves.

Copy link
Contributor

Choose a reason for hiding this comment

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

The commits are generated by git rev-parse VER.

So for v1.5.5, under the containerd repo:

$ git rev-parse v1.5.5
d9768bd283183fc51cc587249530adc3fa43ebbb

$ git show d9768bd283183fc51cc587249530adc3fa43ebbb
tag v1.5.5
Tagger: Derek McGowan <[email protected]>
Date:   Thu Jul 29 10:03:37 2021 -0700

containerd 1.5.5

...

commit 72cec4be58a9eb6b2910f5d10f1c01ca47d231c0 (tag: v1.5.5)
Merge: 1c13c54c 677fade0
Author: Derek McGowan <[email protected]>
Date:   Thu Jul 29 10:02:27 2021 -0700

    Merge pull request #5805 from dmcgowan/prepare-1.5.5
    
    [release/1.5] Prepare release notes for v1.5.5

Long story short, d9768bd283183fc51cc587249530adc3fa43ebbb is equivalent to 72cec4be58a9eb6b2910f5d10f1c01ca47d231c0 .

SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit vcs-snapshot
Expand Down
2 changes: 1 addition & 1 deletion app-torcx/docker/docker-20.10.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
RDEPEND="
~app-emulation/docker-20.10.7
~app-emulation/docker-cli-20.10.7
~app-emulation/containerd-1.5.4
~app-emulation/containerd-1.5.5
~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.0.1
=dev-libs/libltdl-2.4.6
Expand Down