Skip to content

Commit c22a5fd

Browse files
pendo324pendo324
committed
chore: update runc and ci
Signed-off-by: Justin Alvarez <[email protected]>
1 parent 11c10ff commit c22a5fd

File tree

6 files changed

+51
-37
lines changed

6 files changed

+51
-37
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: ['ubuntu-22.04']
17-
go: ['1.23', '1.24']
17+
go: ['1.24', '1.25']
1818
# Build all variants regardless of failures
1919
fail-fast: false
2020

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SUBMODULES=_submodules
2929
UID:=$(shell id -u)
3030
GID:=$(shell id -g)
3131

32-
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.23-bullseye
32+
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.24-bullseye
3333
export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
3434
export GO_CACHE_VOLUME_NAME?=gocache
3535

‎examples/cmd/remote-snapshotter/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/firecracker-microvm/firecracker-containerd/example/remote-snapshotter
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/containerd/containerd v1.7.27
@@ -34,15 +34,15 @@ require (
3434
github.com/google/uuid v1.6.0 // indirect
3535
github.com/klauspost/compress v1.16.7 // indirect
3636
github.com/moby/locker v1.0.1 // indirect
37-
github.com/moby/sys/mountinfo v0.6.2 // indirect
37+
github.com/moby/sys/mountinfo v0.7.1 // indirect
3838
github.com/moby/sys/sequential v0.5.0 // indirect
3939
github.com/moby/sys/signal v0.7.0 // indirect
4040
github.com/moby/sys/user v0.3.0 // indirect
4141
github.com/moby/sys/userns v0.1.0 // indirect
4242
github.com/opencontainers/go-digest v1.0.0 // indirect
4343
github.com/opencontainers/image-spec v1.1.0 // indirect
44-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
45-
github.com/opencontainers/selinux v1.11.0 // indirect
44+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
45+
github.com/opencontainers/selinux v1.12.0 // indirect
4646
github.com/pkg/errors v0.9.1 // indirect
4747
github.com/sirupsen/logrus v1.9.3 // indirect
4848
go.opencensus.io v0.24.0 // indirect

‎examples/cmd/remote-snapshotter/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@ github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2J
636636
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
637637
github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
638638
github.com/moby/sys/mountinfo v0.6.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
639-
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
640-
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
639+
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
640+
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
641641
github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
642642
github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
643643
github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
@@ -714,15 +714,15 @@ github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.m
714714
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
715715
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
716716
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
717-
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
718-
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
717+
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
718+
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
719719
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
720720
github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
721721
github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
722722
github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
723723
github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
724-
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
725-
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
724+
github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8=
725+
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
726726
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
727727
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
728728
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

‎go.mod‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/firecracker-microvm/firecracker-containerd
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/awslabs/tc-redirect-tap v0.0.0-20211025175357-e30dfca224c2
@@ -20,8 +20,8 @@ require (
2020
github.com/hashicorp/go-multierror v1.1.1
2121
github.com/miekg/dns v1.1.62
2222
github.com/opencontainers/image-spec v1.1.0
23-
github.com/opencontainers/runc v1.1.14
24-
github.com/opencontainers/runtime-spec v1.1.0
23+
github.com/opencontainers/runc v1.2.8
24+
github.com/opencontainers/runtime-spec v1.2.0
2525
github.com/pelletier/go-toml v1.9.5
2626
github.com/shirou/gopsutil v2.18.12+incompatible
2727
github.com/sirupsen/logrus v1.9.3
@@ -46,10 +46,10 @@ require (
4646
github.com/beorn7/perks v1.0.1 // indirect
4747
github.com/blang/semver/v4 v4.0.0 // indirect
4848
github.com/cespare/xxhash/v2 v2.2.0 // indirect
49-
github.com/cilium/ebpf v0.9.1 // indirect
49+
github.com/cilium/ebpf v0.16.0 // indirect
5050
github.com/containerd/cgroups v1.1.0 // indirect
5151
github.com/containerd/cgroups/v3 v3.0.2 // indirect
52-
github.com/containerd/console v1.0.3 // indirect
52+
github.com/containerd/console v1.0.5 // indirect
5353
github.com/containerd/errdefs v0.3.0 // indirect
5454
github.com/containerd/go-cni v1.1.9 // indirect
5555
github.com/containerd/imgcrypt v1.1.8 // indirect
@@ -59,6 +59,7 @@ require (
5959
github.com/containers/ocicrypt v1.1.10 // indirect
6060
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6161
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
62+
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
6263
github.com/davecgh/go-spew v1.1.1 // indirect
6364
github.com/distribution/reference v0.6.0 // indirect
6465
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -98,14 +99,14 @@ require (
9899
github.com/klauspost/cpuid/v2 v2.0.4 // indirect
99100
github.com/mailru/easyjson v0.7.7 // indirect
100101
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
101-
github.com/mdlayher/socket v0.2.0 // indirect
102+
github.com/mdlayher/socket v0.4.1 // indirect
102103
github.com/mdlayher/vsock v1.1.1 // indirect
103104
github.com/miekg/pkcs11 v1.1.1 // indirect
104105
github.com/minio/sha256-simd v1.0.0 // indirect
105106
github.com/mitchellh/mapstructure v1.4.3 // indirect
106107
github.com/moby/locker v1.0.1 // indirect
107108
github.com/moby/spdystream v0.2.0 // indirect
108-
github.com/moby/sys/mountinfo v0.6.2 // indirect
109+
github.com/moby/sys/mountinfo v0.7.1 // indirect
109110
github.com/moby/sys/sequential v0.5.0 // indirect
110111
github.com/moby/sys/signal v0.7.0 // indirect
111112
github.com/moby/sys/symlink v0.2.0 // indirect
@@ -116,7 +117,7 @@ require (
116117
github.com/oklog/ulid v1.3.1 // indirect
117118
github.com/opencontainers/go-digest v1.0.0 // indirect
118119
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
119-
github.com/opencontainers/selinux v1.11.0 // indirect
120+
github.com/opencontainers/selinux v1.12.0 // indirect
120121
github.com/opentracing/opentracing-go v1.2.0 // indirect
121122
github.com/pkg/errors v0.9.1 // indirect
122123
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -142,6 +143,7 @@ require (
142143
go.opentelemetry.io/otel/metric v1.27.0 // indirect
143144
go.opentelemetry.io/otel/trace v1.27.0 // indirect
144145
golang.org/x/crypto v0.36.0 // indirect
146+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
145147
golang.org/x/mod v0.18.0 // indirect
146148
golang.org/x/net v0.38.0 // indirect
147149
golang.org/x/oauth2 v0.27.0 // indirect

0 commit comments

Comments
 (0)