f3cdfc488e
runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
58 lines
1.1 KiB
Makefile
58 lines
1.1 KiB
Makefile
GO ?= go
|
|
CC ?= gcc
|
|
|
|
all: build test phaul-test
|
|
|
|
lint:
|
|
golangci-lint run ./...
|
|
|
|
build:
|
|
$(GO) build -v ./...
|
|
|
|
TEST_BINARIES := test/test test/piggie/piggie test/phaul/phaul
|
|
test-bin: $(TEST_BINARIES)
|
|
|
|
test/piggie/piggie: test/piggie/piggie.c
|
|
$(CC) $^ -o $@
|
|
|
|
test/test: test/*.go
|
|
$(GO) build -v -o $@ $^
|
|
|
|
test: $(TEST_BINARIES)
|
|
mkdir -p image
|
|
PID=$$(test/piggie/piggie) && { \
|
|
test/test dump $$PID image && \
|
|
test/test restore image; \
|
|
pkill -9 piggie; \
|
|
}
|
|
rm -rf image
|
|
|
|
test/phaul/phaul: test/phaul/*.go
|
|
$(GO) build -v -o $@ $^
|
|
|
|
phaul-test: $(TEST_BINARIES)
|
|
rm -rf image
|
|
PID=$$(test/piggie/piggie) && { \
|
|
test/phaul/phaul $$PID; \
|
|
pkill -9 piggie; \
|
|
}
|
|
|
|
clean:
|
|
@rm -f $(TEST_BINARIES)
|
|
@rm -rf image
|
|
@rm -f rpc/rpc.proto stats/stats.proto
|
|
|
|
rpc/rpc.proto:
|
|
curl -sSL https://raw.githubusercontent.com/checkpoint-restore/criu/master/images/rpc.proto -o $@
|
|
|
|
stats/stats.proto:
|
|
curl -sSL https://raw.githubusercontent.com/checkpoint-restore/criu/master/images/stats.proto -o $@
|
|
|
|
rpc/rpc.pb.go: rpc/rpc.proto
|
|
protoc --go_out=. $^
|
|
|
|
stats/stats.pb.go: stats/stats.proto
|
|
protoc --go_out=. $^
|
|
|
|
.PHONY: build test phaul-test test-bin clean lint
|