fixup! fixup! fixup! fixup! fixup! Allow normal user to run GSC images

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

gsc.py

@@ -127,7 +127,7 @@ def extract_build_args(args):
 def extract_user_from_image_config(config, env):
     user = config['User']
     if not user:
-        user = "root"
+        user = 'root'
     env.globals.update({'app_user': user})
 
 def merge_two_dicts(dict1, dict2, path=[]):

templates/Dockerfile.common.build.template

@@ -8,10 +8,6 @@ FROM gsc-{{Gramine.Image}} AS gramine
 # Combine Gramine image with the original app image
 FROM {{app_image}}
 
-# App image "user" is stored, and execution will continue as root to install packages.
-# In the signed graminized image, the "user" will be restored.
-ENV app_user={{app_user}}
-
 # Temporarily switch to the root user to install packages
 USER root