diff options
| author | Hilton Chain <hako@ultrarare.space> | 2023-08-11 18:46:28 +0800 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2023-08-29 22:20:33 +0800 |
| commit | 48727c74ac058da23f6cb131f1c8b43a6e640686 (patch) | |
| tree | 7e41a8031c049bc0e887bb2aacc1636fe2e3842f /gnu/packages/docker.scm | |
| parent | 9937194542d5ada550a3ce6de9fe5aa017de5dfd (diff) | |
gnu: containerd: Update to 1.6.22.
* gnu/packages/docker.scm (containerd): Update to 1.6.22.
[#:phases]<patch-paths>: Patch Runtime name.
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0b2a18d6616..3815824202c 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm | |||
| @@ -177,7 +177,7 @@ Python without keeping their credentials in a Docker configuration file.") | |||
| 177 | (define-public containerd | 177 | (define-public containerd |
| 178 | (package | 178 | (package |
| 179 | (name "containerd") | 179 | (name "containerd") |
| 180 | (version "1.6.6") | 180 | (version "1.6.22") |
| 181 | (source | 181 | (source |
| 182 | (origin | 182 | (origin |
| 183 | (method git-fetch) | 183 | (method git-fetch) |
| @@ -186,7 +186,7 @@ Python without keeping their credentials in a Docker configuration file.") | |||
| 186 | (commit (string-append "v" version)))) | 186 | (commit (string-append "v" version)))) |
| 187 | (file-name (git-file-name name version)) | 187 | (file-name (git-file-name name version)) |
| 188 | (sha256 | 188 | (sha256 |
| 189 | (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr")) | 189 | (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8")) |
| 190 | (patches | 190 | (patches |
| 191 | (search-patches "containerd-create-pid-file.patch")))) | 191 | (search-patches "containerd-create-pid-file.patch")))) |
| 192 | (build-system go-build-system) | 192 | (build-system go-build-system) |
| @@ -215,7 +215,12 @@ Python without keeping their credentials in a Docker configuration file.") | |||
| 215 | (("DefaultRuntimeName: \"runc\"") | 215 | (("DefaultRuntimeName: \"runc\"") |
| 216 | (string-append "DefaultRuntimeName: \"" | 216 | (string-append "DefaultRuntimeName: \"" |
| 217 | (search-input-file inputs "/sbin/runc") | 217 | (search-input-file inputs "/sbin/runc") |
| 218 | "\""))) | 218 | "\"")) |
| 219 | ;; ContainerdConfig.Runtimes | ||
| 220 | (("\"runc\":") | ||
| 221 | (string-append "\"" | ||
| 222 | (search-input-file inputs "/sbin/runc") | ||
| 223 | "\":"))) | ||
| 219 | (substitute* "vendor/github.com/containerd/go-runc/runc.go" | 224 | (substitute* "vendor/github.com/containerd/go-runc/runc.go" |
| 220 | (("DefaultCommand[ \t]*=.*") | 225 | (("DefaultCommand[ \t]*=.*") |
| 221 | (string-append "DefaultCommand = \"" | 226 | (string-append "DefaultCommand = \"" |
