SearXNG quadlet: use AddCapability= (the generator rejects CapAdd=)
The podman quadlet generator fails with "unsupported key 'CapAdd' in group 'Container'" and skips the whole unit. The correct key is AddCapability= (maps to podman --cap-add). Update the gluetun unit and its test seam.
This commit is contained in:
@@ -17,7 +17,7 @@ After=searxng-network.service network.target
|
|||||||
ContainerName=gluetun
|
ContainerName=gluetun
|
||||||
Network=searxng.network
|
Network=searxng.network
|
||||||
Image=docker.io/qmcgaw/gluetun:latest
|
Image=docker.io/qmcgaw/gluetun:latest
|
||||||
CapAdd=NET_ADMIN
|
AddCapability=NET_ADMIN
|
||||||
Device=/dev/net/tun:/dev/net/tun
|
Device=/dev/net/tun:/dev/net/tun
|
||||||
Environment=VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER}
|
Environment=VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER}
|
||||||
Environment=VPN_TYPE=${VPN_TYPE}
|
Environment=VPN_TYPE=${VPN_TYPE}
|
||||||
|
|||||||
@@ -37,8 +37,8 @@ QDIR="$REPO_ROOT/dankclaw/searxng/quadlet"
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "gluetun has NET_ADMIN and the /dev/net/tun device" {
|
@test "gluetun has NET_ADMIN and the /dev/net/tun device" {
|
||||||
grep -qE '^CapAdd=NET_ADMIN' "$QDIR/gluetun.container" \
|
grep -qE '^AddCapability=NET_ADMIN' "$QDIR/gluetun.container" \
|
||||||
|| { echo "gluetun.container must set CapAdd=NET_ADMIN"; return 1; }
|
|| { echo "gluetun.container must set AddCapability=NET_ADMIN"; return 1; }
|
||||||
grep -qE '^Device=/dev/net/tun' "$QDIR/gluetun.container" \
|
grep -qE '^Device=/dev/net/tun' "$QDIR/gluetun.container" \
|
||||||
|| { echo "gluetun.container must set Device=/dev/net/tun"; return 1; }
|
|| { echo "gluetun.container must set Device=/dev/net/tun"; return 1; }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user