Skip to content

Commit

Permalink
Update config template and documentation to v1.3.1
Browse files Browse the repository at this point in the history
This also removes a note about unimplemented "scripts as entrypoints"
(previously, Gramine only supported binaries as entrypoints). This
feature is implemented in Gramine v1.3.1.

Co-authored-by: aneessahib <anees.a.sahib@intel.com>
Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
Signed-off-by: aneessahib <anees.a.sahib@intel.com>
  • Loading branch information
dimakuv and aneessahib committed Sep 30, 2022
1 parent 08add16 commit eff9390
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
15 changes: 3 additions & 12 deletions Documentation/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ in :file:`config.yaml.template`.
.. describe:: Distro

Defines Linux distribution to be used to build Gramine in. Currently tested
distros are Ubuntu 18.04, Ubuntu 20.04, Ubuntu 21.04 and CentOS 8. Default
value is ``ubuntu:18.04``.
distros are Ubuntu 18.04, Ubuntu 20.04, Ubuntu 21.04, Debian 10, Debian 11
and CentOS 8. Default value is ``ubuntu:18.04``.

.. describe:: Registry

Expand All @@ -316,7 +316,7 @@ in :file:`config.yaml.template`.

.. describe:: Gramine.Branch

Use this release/branch of the repository. Default value: ``v1.2``.
Use this release/branch of the repository. Default value: ``v1.3.1``.

.. describe:: Gramine.Image

Expand Down Expand Up @@ -528,12 +528,3 @@ you must manually add them to the manifest::
sgx.trusted_files = [ "file:file1", "file:file2" ]
or
sgx.allowed_files = [ "file:file3", "file:file4" ]

Docker images with non-executables as entrypoint
------------------------------------------------

Docker images may contain a script entrypoint which is not an ELF executable.
:program:`gsc` fails to recognize such entrypoints and fails during the image
build. A workaround relies on creating an image from the application image which
has an entrypoint of the script interpreter with the script as an argument. This
allows :program:`gsc` to start the interpreter instead of the script.
2 changes: 1 addition & 1 deletion config.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Registry: ""
# below; typically, you want to keep the default values though
Gramine:
Repository: "https://github.com/gramineproject/gramine.git"
Branch: "v1.2"
Branch: "v1.3.1"

# Specify the Intel SGX driver installed on your machine (more specifically, on the machine where
# the graminized Docker container will run); there are several variants of the SGX driver:
Expand Down

0 comments on commit eff9390

Please sign in to comment.