Skip to content

Commit

Permalink
feat(22.04): add crun and uidmap slices (#222)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: Rafid Bin Mostofa <[email protected]>
Co-authored-by: Cristovao Cordeiro <[email protected]>
  • Loading branch information
3 people authored Sep 27, 2024
1 parent ee14f88 commit c399e84
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 0 deletions.
22 changes: 22 additions & 0 deletions slices/crun.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package: crun

essential:
- crun_copyright

slices:
bins:
essential:
- crun_libs
- libc6_libs
- libcap2_libs
- libseccomp2_libs
- libsystemd0_libs
- libyajl2_libs
contents:
/usr/bin/crun:
libs:
contents:
/usr/lib/*-linux-*/libcrun.a:
copyright:
contents:
/usr/share/doc/crun/copyright:
12 changes: 12 additions & 0 deletions slices/libaudit-common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: libaudit-common

essential:
- libaudit-common_copyright

slices:
config:
contents:
/etc/libaudit.conf:
copyright:
contents:
/usr/share/doc/libaudit-common/copyright:
16 changes: 16 additions & 0 deletions slices/libaudit1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: libaudit1

essential:
- libaudit1_copyright

slices:
libs:
essential:
- libaudit-common_config
- libc6_libs
- libcap-ng0_libs
contents:
/lib/*-linux-*/libaudit.so.1*:
copyright:
contents:
/usr/share/doc/libaudit1/copyright:
14 changes: 14 additions & 0 deletions slices/libcap-ng0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package: libcap-ng0

essential:
- libcap-ng0_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/lib/*-linux-*/libcap-ng.so.0*:
copyright:
contents:
/usr/share/doc/libcap-ng0/copyright:
14 changes: 14 additions & 0 deletions slices/libcap2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package: libcap2

essential:
- libcap2_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/lib/*-linux-*/libcap.so.2*:
copyright:
contents:
/usr/share/doc/libcap2/copyright:
14 changes: 14 additions & 0 deletions slices/liblz4-1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package: liblz4-1

essential:
- liblz4-1_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/liblz4.so.1*:
copyright:
contents:
/usr/share/doc/liblz4-1/copyright:
14 changes: 14 additions & 0 deletions slices/libseccomp2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package: libseccomp2

essential:
- libseccomp2_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libseccomp.so.2*:
copyright:
contents:
/usr/share/doc/libseccomp2/copyright:
19 changes: 19 additions & 0 deletions slices/libsystemd0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package: libsystemd0

essential:
- libsystemd0_copyright

slices:
libs:
essential:
- libc6_libs
- libcap2_libs
- libgcrypt20_libs
- liblz4-1_libs
- liblzma5_libs
- libzstd1_libs
contents:
/usr/lib/*-linux-*/libsystemd.so.0*:
copyright:
contents:
/usr/share/doc/libsystemd0/copyright:
14 changes: 14 additions & 0 deletions slices/libyajl2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package: libyajl2

essential:
- libyajl2_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libyajl.so.2*:
copyright:
contents:
/usr/share/doc/libyajl2/copyright:
17 changes: 17 additions & 0 deletions slices/uidmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: uidmap

essential:
- uidmap_copyright

slices:
bins:
essential:
- libaudit1_libs
- libc6_libs
- libselinux1_libs
contents:
/usr/bin/newgidmap:
/usr/bin/newuidmap:
copyright:
contents:
/usr/share/doc/uidmap/copyright:
14 changes: 14 additions & 0 deletions tests/spread/integration/crun/task.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
summary: Integration tests for crun

execute: |
rootfs="$(install-slices crun_bins)"
# crun needs proc mounted
mkdir "${rootfs}"/proc
mount --bind /proc "${rootfs}"/proc
chroot "$rootfs" crun --help
chroot "$rootfs" crun list
chroot "$rootfs" crun spec
test -f "$rootfs"/config.json

0 comments on commit c399e84

Please sign in to comment.