From 74e961e2e2015a7973029327575e3f9e2c7dd3c0 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 28 Feb 2018 23:31:10 +0000 Subject: [PATCH] tests: allow to load kernel modules from a test container CRIU needs to load a few modules to checkpoint/resume containers. https://github.com/opencontainers/runc/issues/1745 Signed-off-by: Andrei Vagin --- Dockerfile | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbe3d25ef..2f14dffbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && apt-get install -y \ protobuf-compiler \ python-minimal \ uidmap \ + kmod \ --no-install-recommends \ && apt-get clean diff --git a/Makefile b/Makefile index bd886b29c..36d5065be 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ localtest: make localunittest localintegration localrootlessintegration unittest: runcimage - docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest + docker run -e TESTFLAGS -t --privileged --rm -v /lib/modules:/lib/modules:ro -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest localunittest: all $(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages) integration: runcimage - docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration + docker run -e TESTFLAGS -t --privileged --rm -v /lib/modules:/lib/modules:ro -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration localintegration: all bats -t tests/integration${TESTFLAGS}