mirror of
https://github.com/containers/podman.git
synced 2025-07-03 09:17:15 +08:00
Merge pull request #25735 from Luap99/cdi-compose
test/compose: use --cdi-spec-dir not /etc/cdi
This commit is contained in:
@ -1,9 +1 @@
|
||||
if is_rootless; then
|
||||
reason=" - can't write to /etc/cdi"
|
||||
_show_ok skip "$testname # skip$reason"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
mkdir -p /etc/cdi
|
||||
mount -t tmpfs tmpfs /etc/cdi
|
||||
cp device.json /etc/cdi
|
||||
cp device.json $WORKDIR/cdi
|
||||
|
@ -1,3 +0,0 @@
|
||||
if ! is_rootless; then
|
||||
umount -l /etc/cdi
|
||||
fi
|
@ -198,12 +198,12 @@ function start_service() {
|
||||
|
||||
# FIXME: use ${testname} subdir but we can't: 50-char limit in runroot
|
||||
if ! is_rootless; then
|
||||
rm -rf $WORKDIR/{root,runroot,cni}
|
||||
rm -rf $WORKDIR/{root,runroot,networks,cdi}
|
||||
else
|
||||
$PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,cni}
|
||||
$PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks,cdi}
|
||||
fi
|
||||
rm -f $DOCKER_SOCK
|
||||
mkdir --mode 0755 $WORKDIR/{root,runroot,cni}
|
||||
mkdir --mode 0755 $WORKDIR/{root,runroot,networks,cdi}
|
||||
chcon --reference=/var/lib/containers $WORKDIR/root
|
||||
|
||||
$PODMAN_BIN \
|
||||
@ -212,7 +212,8 @@ function start_service() {
|
||||
--root $WORKDIR/root \
|
||||
--runroot $WORKDIR/runroot \
|
||||
--cgroup-manager=systemd \
|
||||
--network-config-dir $WORKDIR/cni \
|
||||
--network-config-dir $WORKDIR/networks \
|
||||
--cdi-spec-dir $WORKDIR/cdi \
|
||||
system service \
|
||||
--time 0 unix://$DOCKER_SOCK \
|
||||
&> $WORKDIR/server.log &
|
||||
@ -239,7 +240,8 @@ function podman() {
|
||||
--storage-driver=vfs \
|
||||
--root $WORKDIR/root \
|
||||
--runroot $WORKDIR/runroot \
|
||||
--network-config-dir $WORKDIR/cni \
|
||||
--network-config-dir $WORKDIR/networks \
|
||||
--cdi-spec-dir $WORKDIR/cdi \
|
||||
"$@")
|
||||
rc=$?
|
||||
|
||||
|
Reference in New Issue
Block a user