Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,24 @@ ADD https://github.com/kata-containers/kata-containers.git#${KATA_VERSION} /src/

WORKDIR /src/kata-containers/tools/packaging/kernel

COPY <<EOF configs/fragments/x86_64/dojo.conf
CONFIG_SECURITY_LANDLOCK=y

CONFIG_BPF_JIT=y
CONFIG_BPF_SYSCALL=y
Comment on lines +18 to +22

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Wire kernel fragment into build

The Dockerfile now writes a configs/fragments/x86_64/dojo.conf fragment with the Landlock/BPF options, but the subsequent kernel build still runs with the default fragment set and no change to include this file. The previous Landlock tweak went straight into base.conf, which build-kernel.sh consumes, so moving the options into an unreferenced fragment means the BPF settings never reach the kata kernel and Landlock is no longer enabled.

Useful? React with 👍 / 👎.

CONFIG_BPF=y
CONFIG_DEBUG_INFO_BTF=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_KPROBE_EVENTS=y
CONFIG_KPROBES=y
CONFIG_PERF_EVENTS=y
CONFIG_PROFILING=y
EOF

RUN <<EOF
KERNEL_VERSION=$(yq -r '.assets.kernel.version' ../../../versions.yaml)
echo 'CONFIG_SECURITY_LANDLOCK=y' >> configs/fragments/x86_64/base.conf
./build-kernel.sh -v "$KERNEL_VERSION" setup
./build-kernel.sh -v "$KERNEL_VERSION" build
./build-kernel.sh -v "$KERNEL_VERSION" install
Expand Down