Fix installation of Gramine DCAP support on Ubuntu #216
Conversation
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @dimakuv)
templates/Dockerfile.common.compile.template line 33 at r1 (raw file):
--buildtype={{buildtype}} \ -Ddirect=enabled -Dsgx=enabled \ {% if template_path(Distro).startswith('ubuntu') %}-Ddcap=enabled{% endif %} \
If it's ubuntu:VER then it should be .startswith('ubuntu:') to match exactly what we want.
Commit 7620ef0 "Add support for SLES 15 SP4" introduced a bug in `Dockerfile.common.compile.template`. Instead of enabling Gramine DCAP support when the distro name starts with "ubuntu", the commit changed it to exactly equal to "ubuntu". This resulted in Gramine DCAP support always being disabled because `template_path(Distro)` returned strings like "ubuntu:22.04". Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
dimakuv
force-pushed
the
dimakuv/fix-compile-template-dcap
branch
from
46170dc
to
7fc918a
Compare
There was a problem hiding this comment.
Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @mkow)
templates/Dockerfile.common.compile.template line 33 at r1 (raw file):
Previously, mkow (Michał Kowalczyk) wrote…
If it's
ubuntu:VERthen it should be.startswith('ubuntu:')to match exactly what we want.
Done.
There was a problem hiding this comment.
Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, all discussions resolved, not enough approvals from maintainers (1 more required)
Description of the changes
Commit 7620ef0 "Add support for SLES 15 SP4" introduced a bug in
Dockerfile.common.compile.template. Instead of enabling Gramine DCAP support when the distro name starts with "ubuntu", the commit changed it to exactly equal to "ubuntu". This resulted in Gramine DCAP support always being disabled becausetemplate_path(Distro)returned strings like "ubuntu:22.04".Fixes #213
How to test this PR?
Try any Ubuntu distro.
This change is