Skip to content

Commit caaf7ad

Browse files
mythimythi
committed
runc: enable misc stats enabled libcontainers
-tags runc_nodmz added temporarily due to opencontainers/runc#4096
1 parent bf2a7fe commit caaf7ad

File tree

6 files changed

+101
-82
lines changed

6 files changed

+101
-82
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
GO := go
1616
GOLANGCI_VER := v1.54.1
17-
GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
17+
GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race -tags runc_nodmz)
1818
arch ?= $(shell go env GOARCH)
1919

2020
all: presubmit build test

‎build/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -e
1919
export GOOS=${GOOS:-$(go env GOOS)}
2020
export GOARCH=${GOARCH:-$(go env GOARCH)}
2121
export CGO_ENABLED=${GO_CGO_ENABLED:-"1"}
22-
GO_FLAGS=${GO_FLAGS:-"-tags=netgo"} # Extra go flags to use in the build.
22+
GO_FLAGS=${GO_FLAGS:-"-tags=netgo,runc_nodmz"} # Extra go flags to use in the build.
2323
BUILD_USER=${BUILD_USER:-"${USER}@${HOSTNAME}"}
2424
BUILD_DATE=${BUILD_DATE:-$( date +%Y%m%d-%H:%M:%S )}
2525
VERBOSE=${VERBOSE:-}

‎cmd/go.mod

+13-11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ require github.com/google/cadvisor v0.0.0
1111
// Use the relative local source of the github.com/google/cadvisor library to build
1212
replace github.com/google/cadvisor => ../
1313

14+
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20231025141802-edd00eb3cbd2
15+
1416
require (
1517
github.com/Rican7/retry v0.3.1
1618
github.com/SeanDolphin/bqschema v1.0.0
@@ -40,11 +42,11 @@ require (
4042
github.com/beorn7/perks v1.0.1 // indirect
4143
github.com/blang/semver/v4 v4.0.0 // indirect
4244
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43-
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
44-
github.com/cilium/ebpf v0.7.0 // indirect
45+
github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect
46+
github.com/cilium/ebpf v0.12.2 // indirect
4547
github.com/containerd/console v1.0.3 // indirect
4648
github.com/containerd/ttrpc v1.2.2 // indirect
47-
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
49+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4850
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
4951
github.com/davecgh/go-spew v1.1.1 // indirect
5052
github.com/docker/distribution v2.8.2+incompatible // indirect
@@ -56,7 +58,7 @@ require (
5658
github.com/eapache/queue v1.1.0 // indirect
5759
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
5860
github.com/go-logr/logr v1.2.3 // indirect
59-
github.com/godbus/dbus/v5 v5.0.6 // indirect
61+
github.com/godbus/dbus/v5 v5.1.0 // indirect
6062
github.com/gogo/protobuf v1.3.2 // indirect
6163
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6264
github.com/golang/protobuf v1.5.3 // indirect
@@ -76,32 +78,32 @@ require (
7678
github.com/jmespath/go-jmespath v0.4.0 // indirect
7779
github.com/karrick/godirwalk v1.17.0 // indirect
7880
github.com/klauspost/compress v1.15.11 // indirect
79-
github.com/kr/text v0.2.0 // indirect
8081
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
8182
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
8283
github.com/moby/sys/mountinfo v0.6.2 // indirect
83-
github.com/mrunalp/fileutils v0.5.0 // indirect
84+
github.com/moby/sys/user v0.1.0 // indirect
85+
github.com/mrunalp/fileutils v0.5.1 // indirect
8486
github.com/opencontainers/go-digest v1.0.0 // indirect
8587
github.com/opencontainers/image-spec v1.0.2 // indirect
8688
github.com/opencontainers/runc v1.1.9 // indirect
87-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
88-
github.com/opencontainers/selinux v1.10.0 // indirect
89+
github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4 // indirect
90+
github.com/opencontainers/selinux v1.11.0 // indirect
8991
github.com/pierrec/lz4/v4 v4.1.17 // indirect
9092
github.com/pkg/errors v0.9.1 // indirect
9193
github.com/pmezard/go-difflib v1.0.0 // indirect
9294
github.com/prometheus/client_model v0.3.0 // indirect
9395
github.com/prometheus/common v0.37.0 // indirect
9496
github.com/prometheus/procfs v0.8.0 // indirect
9597
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
96-
github.com/rogpeppe/go-internal v1.6.1 // indirect
97-
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
98-
github.com/sirupsen/logrus v1.8.1 // indirect
98+
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
99+
github.com/sirupsen/logrus v1.9.3 // indirect
99100
github.com/stretchr/objx v0.5.0 // indirect
100101
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
101102
github.com/vishvananda/netlink v1.1.0 // indirect
102103
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
103104
go.opencensus.io v0.24.0 // indirect
104105
golang.org/x/crypto v0.14.0 // indirect
106+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
105107
golang.org/x/net v0.17.0 // indirect
106108
golang.org/x/sys v0.13.0 // indirect
107109
golang.org/x/text v0.13.0 // indirect

0 commit comments

Comments
 (0)