k4rli/teams-in-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added host dbus sharing to containers

Browse Source
This commit is contained in:
Christoffer Nissen
2022-01-12 12:08:07 +01:00
parent 65204bc6df
commit d17866897c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
host-scripts/teams-wrapper
View File

@@ -60,6 +60,7 @@ prepare_docker_env_parameters() {
ENV_VARS+=" --env=DISPLAY=unix$DISPLAY" ENV_VARS+=" --env=DISPLAY=unix$DISPLAY"
ENV_VARS+=" --env=XAUTHORITY=${XAUTH}" ENV_VARS+=" --env=XAUTHORITY=${XAUTH}"
ENV_VARS+=" --env=TZ=$(date +%Z)" ENV_VARS+=" --env=TZ=$(date +%Z)"
ENV_VARS+=" --env=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket"
} }
prepare_docker_volume_parameters() { prepare_docker_volume_parameters() {
@@ -70,6 +71,7 @@ prepare_docker_volume_parameters() {
VOLUMES+=" --volume=${XSOCK}:${XSOCK}" VOLUMES+=" --volume=${XSOCK}:${XSOCK}"
VOLUMES+=" --volume=${XAUTH}:${XAUTH}" VOLUMES+=" --volume=${XAUTH}:${XAUTH}"
VOLUMES+=" --volume=/run/user/${USER_UID}/pulse:/run/pulse" VOLUMES+=" --volume=/run/user/${USER_UID}/pulse:/run/pulse"
VOLUMES+=" --volume=/run/user/${USER_UID}/bus:/run/dbus/system_bus_socket"
if [ -d "${HOME}/tmp" ]; then if [ -d "${HOME}/tmp" ]; then
VOLUMES+=" --volume=${HOME}/tmp:/home/${TEAMS_DESKTOP_USER}/tmp" VOLUMES+=" --volume=${HOME}/tmp:/home/${TEAMS_DESKTOP_USER}/tmp"

2
host-scripts/teams-wrapper-two
View File

@@ -60,6 +60,7 @@ prepare_docker_env_parameters() {
ENV_VARS+=" --env=DISPLAY=unix$DISPLAY" ENV_VARS+=" --env=DISPLAY=unix$DISPLAY"
ENV_VARS+=" --env=XAUTHORITY=${XAUTH}" ENV_VARS+=" --env=XAUTHORITY=${XAUTH}"
ENV_VARS+=" --env=TZ=$(date +%Z)" ENV_VARS+=" --env=TZ=$(date +%Z)"
ENV_VARS+=" --env=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket"
} }
prepare_docker_volume_parameters() { prepare_docker_volume_parameters() {
@@ -70,6 +71,7 @@ prepare_docker_volume_parameters() {
VOLUMES+=" --volume=${XSOCK}:${XSOCK}" VOLUMES+=" --volume=${XSOCK}:${XSOCK}"
VOLUMES+=" --volume=${XAUTH}:${XAUTH}" VOLUMES+=" --volume=${XAUTH}:${XAUTH}"
VOLUMES+=" --volume=/run/user/${USER_UID}/pulse:/run/pulse" VOLUMES+=" --volume=/run/user/${USER_UID}/pulse:/run/pulse"
VOLUMES+=" --volume=/run/user/${USER_UID}/bus:/run/dbus/system_bus_socket"
if [ -d "${HOME}/tmp" ]; then if [ -d "${HOME}/tmp" ]; then
VOLUMES+=" --volume=${HOME}/tmp:/home/${TEAMS_DESKTOP_USER}/tmp" VOLUMES+=" --volume=${HOME}/tmp:/home/${TEAMS_DESKTOP_USER}/tmp"