Skip to content

Commit 01efd12

Browse files
authored
Merge pull request #5173 from k0sproject/backport-5170-to-release-1.28
[Backport release-1.28] Bump runc to 1.1.15
2 parents 1d62150 + 6616ec1 commit 01efd12

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

embedded-bins/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ alpine_patch_version = $(alpine_version).4
33
golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.19
44
go_version = 1.22.8
55

6-
runc_version = 1.1.14
6+
runc_version = 1.1.15
77
runc_buildimage = $(golang_buildimage)
88
runc_build_go_tags = "seccomp"
99
#runc_build_go_cgo_enabled =

embedded-bins/containerd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARG TARGET_OS \
2424

2525
RUN go version
2626
RUN set -ex \
27-
&& go get github.com/opencontainers/[email protected].14 \
27+
&& go get github.com/opencontainers/[email protected].15 \
2828
&& make \
2929
CGO_ENABLED=${BUILD_GO_CGO_ENABLED} \
3030
SHIM_CGO_ENABLED=${BUILD_SHIM_GO_CGO_ENABLED} \

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ require (
211211
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
212212
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
213213
github.com/opencontainers/go-digest v1.0.0 // indirect
214-
github.com/opencontainers/runc v1.1.14 // indirect
214+
github.com/opencontainers/runc v1.1.15 // indirect
215215
github.com/opencontainers/runtime-spec v1.1.0-rc.2 // indirect
216216
github.com/opencontainers/selinux v1.11.0 // indirect
217217
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
719719
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
720720
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
721721
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
722-
github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w=
723-
github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA=
722+
github.com/opencontainers/runc v1.1.15 h1:QMmSU2q1YUg3iOJX11phnaDi2A5/zhx4BR6h+XZ1DMA=
723+
github.com/opencontainers/runc v1.1.15/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA=
724724
github.com/opencontainers/runtime-spec v1.1.0-rc.2 h1:ucBtEms2tamYYW/SvGpvq9yUN0NEVL6oyLEwDcTSrk8=
725725
github.com/opencontainers/runtime-spec v1.1.0-rc.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
726726
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=

0 commit comments

Comments
 (0)