Job79/devcontainer
1
0
Fork 1
Code Issues Pull Requests Actions Packages Activity

fix: only make dbus env variable available to host script
Some checks failed
Build container / fedora-build (push) Failing after 2m5s
Details

Browse Source
This commit is contained in:
Job
2025-10-24 17:14:13 +02:00
parent 28766d5e87
commit aa3d5d5bb8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
containers/fedora/config/bin/host
View File

@@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
export DBUS_SESSION_BUS_ADDRESS=unix:path=/tmp/bus
host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" \ host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" \
$([ "$(basename "$0")" != "host" ] && echo "$(basename "$0")") "$@" $([ "$(basename "$0")" != "host" ] && echo "$(basename "$0")") "$@"

7
devc.sh
View File

@@ -51,14 +51,13 @@ param_args() {
arg "--device /dev/dri" ;; arg "--device /dev/dri" ;;
-host-spawn) # Enable spawning host commands from inside the container using host-spawn. -host-spawn) # Enable spawning host commands from inside the container using host-spawn.
arg "-v /run/user/$UID/bus:/tmp/bus" arg "-v /run/user/$UID/bus:/tmp/bus"
arg "-e HOST_HOME=$HOME" # Use to translate paths. arg "-e HOST_HOME=$HOME" # Used to translate paths.
arg "-e DBUS_SESSION_BUS_ADDRESS='unix:path=/tmp/bus'"
;; ;;
-x11) # Enable X11 support. -x11) # Enable X11 support.
arg "-e DISPLAY=$DISPLAY"
arg "-e XAUTHORITY=/run/user/1000/.Xauthority"
arg "-v /tmp/.X11-unix:/tmp/.X11-unix" arg "-v /tmp/.X11-unix:/tmp/.X11-unix"
arg "-v $XAUTHORITY:/run/user/1000/.Xauthority:ro" arg "-v $XAUTHORITY:/run/user/1000/.Xauthority:ro"
arg "-e DISPLAY=$DISPLAY"
arg "-e XAUTHORITY=/run/user/1000/.Xauthority"
;; ;;
*) # Use unknown arguments a podman arguments. *) # Use unknown arguments a podman arguments.
arg "$1" ;; arg "$1" ;;