Merge pull request #2643 from OSInside/fix_oci_security_sync_filters

Fix oci security sync filters
OSInside · Sep 11, 2024 · 5eab80c · 5eab80c
2 parents 4a1dc97 + 7ace6fe
commit 5eab80c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/build-tests/x86/tumbleweed/test-image-docker/appliance.kiwi b/build-tests/x86/tumbleweed/test-image-docker/appliance.kiwi
@@ -27,6 +27,7 @@
         <source path="obsrepositories:/"/>
     </repository>
     <packages type="image">
+        <package name="libcap-progs"/>
         <package name="grub2"/>
         <package name="ncurses-utils"/>
         <package name="patterns-openSUSE-base"/>
@@ -39,7 +40,6 @@
         <package name="dracut"/>
         <package name="pigz"/>
         <package name="elfutils"/>
-        <package name="systemd-presets-branding-openSUSE"/>
         <package name="iputils"/>
         <package name="tar"/>
         <package name="psmisc"/>
@@ -57,7 +57,12 @@
         <package name="fipscheck"/>
     </packages>
     <packages type="bootstrap">
+        <package name="gawk"/>
+        <package name="grep"/>
+        <package name="gzip"/>
         <package name="udev"/>
+        <package name="xz"/>
+        <package name="shadow"/>
         <package name="filesystem"/>
         <package name="glibc-locale"/>
         <package name="cracklib-dict-full"/>

diff --git a/kiwi/oci_tools/umoci.py b/kiwi/oci_tools/umoci.py
@@ -137,9 +137,6 @@ def sync_rootfs(self, root_dir, exclude_list=None):
             os.sep.join([self.oci_root_dir, 'rootfs']),
             exclude_list=exclude_list,
             options=Defaults.get_sync_options() + [
-                '--filter', '-x! user.*',
-                '--filter', '-x! security.ima*',
-                '--filter', '-x! security.capability*',
                 '--delete'
             ]
         )

diff --git a/test/unit/oci_tools/umoci_test.py b/test/unit/oci_tools/umoci_test.py
@@ -60,9 +60,6 @@ def test_sync_rootfs(self, mock_sync):
             options=[
                 '--archive', '--hard-links', '--xattrs', '--acls',
                 '--one-file-system', '--inplace',
-                '--filter', '-x! user.*',
-                '--filter', '-x! security.ima*',
-                '--filter', '-x! security.capability*',
                 '--delete'
             ]
         )