Add python3-voluptuous dependency in Dockerfile templates

Commit 2427c7306103 ("[python] Add gramine-manifest-check tool") in the core Gramine repository adds a new tool that depends on the `python3-voluptuous` package. GSC thus has an indirect dependency on this package, so we need to add it to the list of deps in all Dockerfile templates. Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
gramineproject · Apr 24, 2024 · 59c0076 · 59c0076
1 parent 662b34e
commit 59c0076
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/templates/centos/Dockerfile.build.template b/templates/centos/Dockerfile.build.template
@@ -21,8 +21,11 @@ RUN dnf update -y \
     && /usr/bin/python3 -B -m pip install click jinja2 protobuf \
                                           'tomli>=1.1.0' 'tomli-w>=0.4.0' \
     && dnf repolist \
-# Install pyelftools after the installation of epel-release as it is provided by the EPEL repo
-    && dnf install -y python3-pyelftools \
+# Install pyelftools and voluptuous after the installation of epel-release as it is provided by the
+# EPEL repo
+    && dnf install -y \
+        python3-pyelftools \
+        python3-voluptuous \
     && dnf -y clean all
 
 {% if buildtype != "release" %}

diff --git a/templates/centos/Dockerfile.sign.template b/templates/centos/Dockerfile.sign.template
@@ -7,9 +7,10 @@ RUN \
        && dnf remove -y binutils \
           epel-release \
           openssl \
+          python3-cryptography \
           python3-protobuf \
           python3-pyelftools \
-          python3-cryptography \
+          python3-voluptuous \
           tcl \
        && dnf -y clean all;
 {% endblock %}

diff --git a/templates/debian/Dockerfile.build.template b/templates/debian/Dockerfile.build.template
@@ -15,6 +15,7 @@ RUN apt-get update \
         python3-cryptography \
         python3-protobuf \
         python3-pyelftools \
+        python3-voluptuous \
 # Debian 12 and Ubuntu 23.04 adopted PEP 668, which dictates that `pip` can no longer install
 # packages managed by the distro's general-purpose package manager, hence we use `apt-get`
         {%- if (distro[0] == "debian" and distro[1] | int >= 12) or

diff --git a/templates/debian/Dockerfile.sign.template b/templates/debian/Dockerfile.sign.template
@@ -5,9 +5,10 @@
 RUN \
         apt-get remove -y binutils \
         openssl \
-        python3-protobuf \
         python3-cryptography \
+        python3-protobuf \
         python3-pyelftools \
+        python3-voluptuous \
 # please see the comment in Dockerfile.build.template for explanation why this condition is needed
         {%- if (distro[0] == "debian" and distro[1] | int >= 12) or
                (distro[0] == "ubuntu" and distro[1] | int >= 23) %}

diff --git a/templates/redhat/ubi8-minimal/Dockerfile.build.template b/templates/redhat/ubi8-minimal/Dockerfile.build.template
@@ -23,6 +23,7 @@ RUN rm -rf /etc/rhsm-host \
         python3-pip \
         python3-protobuf \
         python3-pyelftools \
+        python3-voluptuous \
         wget \
         which \
     && /usr/bin/python3 -B -m pip install click jinja2 \

diff --git a/templates/redhat/ubi8-minimal/Dockerfile.sign.template b/templates/redhat/ubi8-minimal/Dockerfile.sign.template
@@ -12,6 +12,7 @@ RUN \
           python3-cryptography \
           python3-protobuf \
           python3-pyelftools \
+          python3-voluptuous \
        && microdnf -y clean all;
 {% endblock %}
 

diff --git a/templates/redhat/ubi8/Dockerfile.build.template b/templates/redhat/ubi8/Dockerfile.build.template
@@ -22,6 +22,7 @@ RUN rm -rf /etc/rhsm-host \
         python3-pip \
         python3-protobuf \
         python3-pyelftools \
+        python3-voluptuous \
         wget \
     && /usr/bin/python3 -B -m pip install click jinja2 \
                                           'tomli>=1.1.0' 'tomli-w>=0.4.0' \