Fix LD_LIBRARY_PATH in Ubuntu 21.04 Docker images

Now GSC supports base Docker images with Ubuntu 18.04, 20.04 and 21.04.

Signed-off-by: Veena Saini <[email protected]>

finalize_manifest.py

@@ -87,6 +87,11 @@ def generate_library_paths():
 
     # Library paths start without whitespace (in contrast to libraries found under this path)
     ld_paths = (line for line in ld_paths if not re.match(r'(^\s)', line))
+
+    # ldconfig utility in Ubuntu 21.04 produces output lines like
+    # “/usr/local/lib: (from /etc/ld.so.conf.d/libc.conf:2)” – must take only the first part
+    # of this line (the actual path name)
+    ld_paths = ((line.split('(from')[0]).rstrip() for line in ld_paths)
     return ''.join(ld_paths) + os.getenv('LD_LIBRARY_PATH', default='')
 
 

templates/entrypoint.manifest.template

@@ -1,7 +1,8 @@
 loader.entrypoint = "file:/gramine/meson_build_output/lib/x86_64-linux-gnu/gramine/libsysdb.so"
 libos.entrypoint = "/{{binary}}"
 
-loader.env.LD_LIBRARY_PATH = "/gramine/meson_build_output/lib/x86_64-linux-gnu/gramine/runtime/glibc:{{"{{library_paths}}"}}"
+# ldconfig in Ubuntu 21.04 doesn't produce "/usr/lib/x86_64-linux-gnu" so add it explicitly
+loader.env.LD_LIBRARY_PATH = "/gramine/meson_build_output/lib/x86_64-linux-gnu/gramine/runtime/glibc:/usr/lib/x86_64-linux-gnu:{{"{{library_paths}}"}}"
 loader.env.PATH = "{{"{{env_path}}"}}"
 loader.log_level = {% if debug %} "all" {% else %} "error" {% endif %}