fixup! Remove Gramine dependencies that are not needed at runtime

Signed-off-by: abin <[email protected]>
gramineproject · Apr 21, 2023 · 4ff2def · 4ff2def
1 parent 06eaa88
commit 4ff2def
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/templates/Dockerfile.common.sign.template b/templates/Dockerfile.common.sign.template
@@ -18,10 +18,13 @@ FROM {{image}}
 COPY --from=unsigned_image /gramine/app_files/*.sig /gramine/app_files/
 COPY --from=unsigned_image /gramine/app_files/*.sgx /gramine/app_files/
 
+{% if remove_gramine_deps %}
 # Temporarily switch to the root user to uninstall packages
 USER root
 
 {% block uninstall %}{% endblock %}
 
 # Switch back to original app_image user
 USER {{app_user}}
+{% endif %}
+
diff --git a/templates/centos/Dockerfile.sign.template b/templates/centos/Dockerfile.sign.template
@@ -1,7 +1,6 @@
 {% extends "Dockerfile.common.sign.template" %}
 
 {% block uninstall %}
-{% if remove_gramine_deps %}
 RUN \
        dnf update -y \
        && dnf install -y python3-pip \
@@ -19,7 +18,6 @@ RUN \
           python3-cryptography \
           tcl \
        && dnf -y clean all;
-{% endif %}
 {% endblock %}
 
 {% block path %}export PYTHONPATH="${PYTHONPATH}:$(find /gramine/meson_build_output/lib64 -type d -path '*/site-packages')" &&{% endblock %}
diff --git a/templates/debian/Dockerfile.sign.template b/templates/debian/Dockerfile.sign.template
@@ -1,7 +1,6 @@
 {% extends "Dockerfile.common.sign.template" %}
 
 {% block uninstall %}
-{% if remove_gramine_deps %}
 RUN \
        apt update -y \
        && apt install -y python3-pip \
@@ -18,7 +17,6 @@ RUN \
           python3-pyelftools \
        && apt autoremove -y \
        && rm -rf /var/lib/apt/lists/*;
-{% endif %}
 {% endblock %}
 
 {% block path %}export PYTHONPATH="${PYTHONPATH}:$(find /gramine/meson_build_output/lib -type d -path '*/site-packages')" &&{% endblock %}