Skip to content

Commit

Permalink
Fix installation of Gramine DCAP support on Ubuntu
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
dimakuv committed Sep 27, 2024
1 parent 3168b08 commit 7fc918a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion templates/Dockerfile.common.compile.template
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN cd /gramine \
&& meson setup build/ --prefix="/gramine/meson_build_output" \
--buildtype={{buildtype}} \
-Ddirect=enabled -Dsgx=enabled \
{% if template_path(Distro) == 'ubuntu' %}-Ddcap=enabled{% endif %} \
{% if template_path(Distro).startswith('ubuntu:') %}-Ddcap=enabled{% endif %} \
{% if "linux-sgx-driver" in SGXDriver.Repository %} \
-Dsgx_driver=oot -Dsgx_driver_include_path=/gramine/driver \
{% else %} \
Expand Down

0 comments on commit 7fc918a

Please sign in to comment.