Update Docker to 29.1.1 #27995
+16
−16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=containerd | ||
| PKG_VERSION:=2.2.0 | ||
| PKG_RELEASE:=1 | ||
| PKG_LICENSE:=Apache-2.0 | ||
| PKG_LICENSE_FILES:=LICENSE | ||
| PKG_CPE_ID:=cpe:/a:linuxfoundation:containerd | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? | ||
| PKG_HASH:=86e7a268fc73f5332522baef86082c1d6c17986e2957a9ad842ead35d1080fca | ||
|
|
||
| PKG_MAINTAINER:=Gerard Ryan <[email protected]> | ||
|
|
||
|
|
@@ -59,7 +59,7 @@ Build/Compile=$(call Build/Compile/Default) | |
|
|
||
| define Package/containerd/install | ||
| $(INSTALL_DIR) $(1)/usr/bin/ | ||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/{ctr,containerd,containerd-stress,containerd-shim-runc-v2} $(1)/usr/bin/ | ||
| endef | ||
|
|
||
| $(eval $(call BuildPackage,containerd)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=docker | ||
| PKG_VERSION:=29.1.1 | ||
| PKG_RELEASE:=1 | ||
| PKG_LICENSE:=Apache-2.0 | ||
| PKG_LICENSE_FILES:=LICENSE | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_GIT_URL:=github.com/docker/cli | ||
| PKG_GIT_REF:=v$(PKG_VERSION) | ||
| PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? | ||
| PKG_HASH:=a02081b7d6fb10bfbc8afb621e7edc5124048b31eea7a1ab73c7ccd924b03a66 | ||
| PKG_GIT_SHORT_COMMIT:=0aedba5 # SHA1 used within the docker executables | ||
|
|
||
| PKG_MAINTAINER:=Gerard Ryan <[email protected]> | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=dockerd | ||
| PKG_VERSION:=29.1.1 | ||
| PKG_RELEASE:=1 | ||
| PKG_LICENSE:=Apache-2.0 | ||
| PKG_LICENSE_FILES:=LICENSE | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_GIT_URL:=github.com/moby/moby | ||
| PKG_GIT_REF:=docker-v$(PKG_VERSION) | ||
|
Contributor
There was a problem hiding this comment. Why did we add "docker-" here?
Author
There was a problem hiding this comment.
because the version number 29.x has an extra "docker-" at the beginning.
Contributor
There was a problem hiding this comment. oh, I missed that detail, thanks!
Member
There was a problem hiding this comment. Should be in the commit description.
Author
There was a problem hiding this comment.
|
||
| PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? | ||
| PKG_HASH:=65221f1c70feb1bd1562bb1017b586e4528be877656dc16f5be5659fc9b7e522 | ||
| PKG_GIT_SHORT_COMMIT:=9a84135 # SHA1 used within the docker executables | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Hi, please remove this extra newline |
||
| PKG_MAINTAINER:=Gerard Ryan <[email protected]> | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=runc | ||
| PKG_VERSION:=1.3.3 | ||
| PKG_RELEASE:=1 | ||
| PKG_LICENSE:=Apache-2.0 | ||
| PKG_LICENSE_FILES:=LICENSE | ||
| PKG_CPE_ID:=cpe:/a:linuxfoundation:runc | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? | ||
| PKG_HASH:=3da010af5c2c1c3d12d460255e4a7dc049c223ebc629c80fbbe4c10720997ffe | ||
|
|
||
| PKG_MAINTAINER:=Gerard Ryan <[email protected]> | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these not available anymore or something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Docker 29 has removed old containerd shim processes (containerd-shim and containerd-shim-runc-v1).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Docker version 29 is an upcoming major update that will use containerd-shim-runc-v2 by default and deprecate the older containerd-shim-runc-v1. Therefore, removing containerd-shim-runc-v1 is not a "manual" operation, but rather the default state after the Docker upgrade. It is an inevitable result of the transition of container runtime from the old standard to the new standard (from runc v1 to runc v2). The main purpose is to improve performance, security, and support for the OCI standard. You do not need to actively "remove" it; simply upgrading Docker will achieve the switch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks again for the info!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, please add this to your commit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.