Make shim an optional package for server-image

uyuni-project · Jan 15, 2024 · eed4cc3 · eed4cc3
1 parent 53ab6f6
commit eed4cc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile
@@ -6,6 +6,9 @@ FROM $INIT_IMAGE
 
 ARG PRODUCT_PATTERN_PREFIX="patterns-uyuni"
 
+# Extra packages can be added via project configuration
+ARG EXTRAPACKAGES
+
 COPY timezone_alignment.sh /usr/bin
 
 # Copy timezone link update service
@@ -17,10 +20,10 @@ RUN echo "rpm.install.excludedocs = yes" >>/etc/zypp/zypp.conf
 # Main packages
 RUN zypper ref && zypper --non-interactive up
 RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses --force-resolution \
+    ${EXTRAPACKAGES} \
     ${PRODUCT_PATTERN_PREFIX}_server \
     ${PRODUCT_PATTERN_PREFIX}_retail \
     spacewalk-utils-extras \
-    shim \
     grub2-x86_64-efi \
     ed \
     susemanager-tftpsync \

diff --git a/containers/server-image/server-image.changes.juliogonzalez.container-shim b/containers/server-image/server-image.changes.juliogonzalez.container-shim
@@ -0,0 +1,2 @@
+- Make shim an optional package as it is not available for all
+  architectures