Added support for Podman (#2)
* Changed to Podman * added option to use podman or docker on host * Feature/podman fix (#1) * WIP * WIP * restored dockerfile * podman works rootless savepoint * added bin folder * changed teams-two to podman * changed to podman scheme * updated Makefile * updated README.md * host script refactor * renamed Dockerfile to Containerfile for podman scheme * added ci * changed ci script name * tried changing repo name * prepared merge with main. Added config to swap container runtime with ease
This commit is contained in:
ChristofferNissen
committed by
GitHub
GitHub
parent
16a77bdf18
commit
589d2c5263
@@ -4,28 +4,34 @@
|
||||
SCRIPT_NAME="teams-wrapper"
|
||||
LOCAL_COMPUTER_USERNAME=$(whoami)
|
||||
|
||||
# Docker config
|
||||
IMAGE_NAME="stifstof/teams-desktop:latest"
|
||||
# registry config
|
||||
IMAGE_NAME="docker.io/stifstof/teams-desktop:latest"
|
||||
CONTAINER_NAME="teams"
|
||||
CONFIG_PATH="${HOME}/.config/Microsoft"
|
||||
|
||||
|
||||
|
||||
|
||||
# Container runtime (docker or podman)
|
||||
CONTAINER_ENGINE="${CONTAINER_ENGINE}"
|
||||
if [ -z "$CONTAINER_ENGINE" ]
|
||||
then
|
||||
echo "\$CONTAINER_ENGINE is empty. Defaulting to podman"
|
||||
CONTAINER_ENGINE="podman"
|
||||
fi
|
||||
|
||||
########## Script
|
||||
|
||||
PATH=/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
PATH=/home/cn/Documents/git/TeamsInDocker/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
TEAMS_DESKTOP_USER=${LOCAL_COMPUTER_USERNAME}
|
||||
XSOCK=/home/$TEAMS_DESKTOP_USER/X/teamsOne/.X11-unix
|
||||
XAUTH=/home/$TEAMS_DESKTOP_USER/X/teamsOne/."${CONTAINER_ENGINE}".xauth
|
||||
|
||||
# do we need to use sudo to start docker containers?
|
||||
(id -Gn | grep -q docker) || SUDO=sudo
|
||||
# do we need to use sudo to start containers?
|
||||
if [ "$CONTAINER_ENGINE" == "docker" ]; then
|
||||
(id -Gn | grep -q $CONTAINER_ENGINE) || SUDO=sudo
|
||||
fi
|
||||
|
||||
USER_UID=$(id -u)
|
||||
USER_GID=$(id -g)
|
||||
|
||||
XSOCK=/tmp/.X11-unix-teamsOne
|
||||
XAUTH=/tmp/.docker.xauth-teamsOne
|
||||
|
||||
DOWNLOAD_DIR=$(xdg-user-dir DOWNLOAD)
|
||||
if [ -z "${DOWNLOAD_DIR}" ]; then
|
||||
@@ -35,26 +41,29 @@ fi
|
||||
list_commands() {
|
||||
echo ""
|
||||
echo "Launch teams using:"
|
||||
echo " teams OR "
|
||||
echo " teams-wrapper teams"
|
||||
echo ""
|
||||
exit 1
|
||||
}
|
||||
|
||||
cleanup_stopped_teams_desktop_instances() {
|
||||
echo "Cleaning up stopped teams-desktop instances..."
|
||||
for c in $(${SUDO} docker ps -a -q); do
|
||||
image="$(${SUDO} docker inspect -f {{.Config.Image}} ${c})"
|
||||
if [ "${image}" == ${IMAGE_NAME} ]; then
|
||||
running=$(${SUDO} docker inspect -f {{.State.Running}} ${c})
|
||||
echo "Cleaning up stopped teams instances..."
|
||||
for c in $(${SUDO} ${CONTAINER_ENGINE} ps -a -q); do
|
||||
image="$(${SUDO} ${CONTAINER_ENGINE} inspect -f {{.Name}} ${c})"
|
||||
if [ "${image}" == "${CONTAINER_NAME}" ]; then
|
||||
running=$(${SUDO} ${CONTAINER_ENGINE} inspect -f {{.State.Running}} ${c})
|
||||
if [ "${running}" != "true" ]; then
|
||||
${SUDO} docker rm "${c}" >/dev/null
|
||||
${SUDO} ${CONTAINER_ENGINE} rm "${c}" >/dev/null
|
||||
fi
|
||||
if [ "${running}" == "true" ]; then
|
||||
${SUDO} ${CONTAINER_ENGINE} kill "${c}" >/dev/null
|
||||
${SUDO} ${CONTAINER_ENGINE} rm "${c}" >/dev/null
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
prepare_docker_env_parameters() {
|
||||
prepare_container_env_parameters() {
|
||||
ENV_VARS+=" --env=USER_UID=${USER_UID}"
|
||||
ENV_VARS+=" --env=USER_GID=${USER_GID}"
|
||||
ENV_VARS+=" --env=DISPLAY=unix$DISPLAY"
|
||||
@@ -63,8 +72,18 @@ prepare_docker_env_parameters() {
|
||||
ENV_VARS+=" --env=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket"
|
||||
}
|
||||
|
||||
prepare_docker_volume_parameters() {
|
||||
create_x_folder() {
|
||||
mkdir "/home/$TEAMS_DESKTOP_USER/X/teamsOne/"
|
||||
touch ${XAUTH}
|
||||
touch ${XSOCK}
|
||||
}
|
||||
|
||||
prepare_container_volume_parameters() {
|
||||
if [ -d "/home/$TEAMS_DESKTOP_USER/X/teamsOne/" ]; then
|
||||
rm -rf "/home/$TEAMS_DESKTOP_USER/X/teamsOne/"
|
||||
fi
|
||||
create_x_folder
|
||||
|
||||
xauth nlist :0 | sed -e 's/^..../ffff/' | xauth -f ${XAUTH} nmerge -
|
||||
|
||||
VOLUMES+=" --volume=${CONFIG_PATH}:/home/${TEAMS_DESKTOP_USER}/.config/Microsoft/"
|
||||
@@ -79,7 +98,7 @@ prepare_docker_volume_parameters() {
|
||||
|
||||
}
|
||||
|
||||
prepare_docker_device_parameters() {
|
||||
prepare_container_device_parameters() {
|
||||
# enumerate video devices for webcam support
|
||||
VIDEO_DEVICES=
|
||||
for device in /dev/video*; do
|
||||
@@ -109,24 +128,21 @@ elif [[ -n ${exec} ]]; then
|
||||
fi
|
||||
|
||||
cleanup_stopped_teams_desktop_instances
|
||||
prepare_docker_env_parameters
|
||||
prepare_docker_volume_parameters
|
||||
prepare_docker_device_parameters
|
||||
prepare_container_env_parameters
|
||||
prepare_container_volume_parameters
|
||||
prepare_container_device_parameters
|
||||
|
||||
echo "Starting ${prog}..."
|
||||
${SUDO} docker run -d \
|
||||
set -o xtrace
|
||||
${SUDO} ${CONTAINER_ENGINE} run -d \
|
||||
--name ${CONTAINER_NAME} \
|
||||
--network host \
|
||||
--privileged \
|
||||
--memory=8g \
|
||||
--shm-size=8g \
|
||||
--memory=4g \
|
||||
--shm-size=4g \
|
||||
--device /dev/dri \
|
||||
--device /dev/snd \
|
||||
--cap-add=SYS_ADMIN \
|
||||
-v /tmp/.X11-unix:/tmp/.X11-unix \
|
||||
-e DISPLAY=unix$DISPLAY \
|
||||
${ENV_VARS} \
|
||||
${VIDEO_DEVICES} \
|
||||
${VOLUMES} \
|
||||
${TEAMS_EXTRA_DOCKER_ARGUMENTS} \
|
||||
${IMAGE_NAME} ${prog} $@ >/dev/null
|
||||
${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
|
||||
${IMAGE_NAME} ${prog} $@ >/dev/null
|
||||
|
||||
@@ -4,28 +4,34 @@
|
||||
SCRIPT_NAME="teams-wrapper-two"
|
||||
LOCAL_COMPUTER_USERNAME=$(whoami)
|
||||
|
||||
# Docker config
|
||||
IMAGE_NAME="stifstof/teams-desktop:latest"
|
||||
# config
|
||||
IMAGE_NAME="docker.io/stifstof/teams-desktop:latest"
|
||||
CONTAINER_NAME="teams-two"
|
||||
CONFIG_PATH="${HOME}/.config/MicrosoftTwo"
|
||||
|
||||
|
||||
|
||||
|
||||
# Container runtime (docker or podman)
|
||||
CONTAINER_ENGINE="${CONTAINER_ENGINE}"
|
||||
if [ -z "$CONTAINER_ENGINE" ]
|
||||
then
|
||||
echo "\$CONTAINER_ENGINE is empty. Defaulting to podman"
|
||||
CONTAINER_ENGINE="podman"
|
||||
fi
|
||||
|
||||
########## Script
|
||||
|
||||
PATH=/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
PATH=/home/cn/Documents/git/TeamsInDocker/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
TEAMS_DESKTOP_USER=${LOCAL_COMPUTER_USERNAME}
|
||||
XSOCK=/home/$TEAMS_DESKTOP_USER/X/teamsTwo/.X11-unix
|
||||
XAUTH=/home/$TEAMS_DESKTOP_USER/X/teamsTwo/."${CONTAINER_ENGINE}".xauth
|
||||
|
||||
# do we need to use sudo to start docker containers?
|
||||
(id -Gn | grep -q docker) || SUDO=sudo
|
||||
if [ "$CONTAINER_ENGINE" == "docker" ]; then
|
||||
(id -Gn | grep -q $CONTAINER_ENGINE) || SUDO=sudo
|
||||
fi
|
||||
|
||||
USER_UID=$(id -u)
|
||||
USER_GID=$(id -g)
|
||||
|
||||
XSOCK=/tmp/.X11-unix-teamsTwo
|
||||
XAUTH=/tmp/.docker.xauth-teamsTwo
|
||||
|
||||
DOWNLOAD_DIR=$(xdg-user-dir DOWNLOAD)
|
||||
if [ -z "${DOWNLOAD_DIR}" ]; then
|
||||
@@ -35,26 +41,29 @@ fi
|
||||
list_commands() {
|
||||
echo ""
|
||||
echo "Launch teams using:"
|
||||
echo " teams OR "
|
||||
echo " teams-wrapper teams"
|
||||
echo ""
|
||||
exit 1
|
||||
}
|
||||
|
||||
cleanup_stopped_teams_desktop_instances() {
|
||||
echo "Cleaning up stopped teams-desktop instances..."
|
||||
for c in $(${SUDO} docker ps -a -q); do
|
||||
image="$(${SUDO} docker inspect -f {{.Config.Image}} ${c})"
|
||||
if [ "${image}" == ${IMAGE_NAME} ]; then
|
||||
running=$(${SUDO} docker inspect -f {{.State.Running}} ${c})
|
||||
echo "Cleaning up stopped teams instances..."
|
||||
for c in $(${SUDO} ${CONTAINER_ENGINE} ps -a -q); do
|
||||
image="$(${SUDO} ${CONTAINER_ENGINE} inspect -f {{.Name}} ${c})"
|
||||
if [ "${image}" == "${CONTAINER_NAME}" ]; then
|
||||
running=$(${SUDO} ${CONTAINER_ENGINE} inspect -f {{.State.Running}} ${c})
|
||||
if [ "${running}" != "true" ]; then
|
||||
${SUDO} docker rm "${c}" >/dev/null
|
||||
${SUDO} ${CONTAINER_ENGINE} rm "${c}" >/dev/null
|
||||
fi
|
||||
if [ "${running}" == "true" ]; then
|
||||
${SUDO} ${CONTAINER_ENGINE} kill "${c}" >/dev/null
|
||||
${SUDO} ${CONTAINER_ENGINE} rm "${c}" >/dev/null
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
prepare_docker_env_parameters() {
|
||||
prepare_container_env_parameters() {
|
||||
ENV_VARS+=" --env=USER_UID=${USER_UID}"
|
||||
ENV_VARS+=" --env=USER_GID=${USER_GID}"
|
||||
ENV_VARS+=" --env=DISPLAY=unix$DISPLAY"
|
||||
@@ -63,8 +72,18 @@ prepare_docker_env_parameters() {
|
||||
ENV_VARS+=" --env=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket"
|
||||
}
|
||||
|
||||
prepare_docker_volume_parameters() {
|
||||
create_x_folder() {
|
||||
mkdir "/home/$TEAMS_DESKTOP_USER/X/teamsTwo/"
|
||||
touch ${XAUTH}
|
||||
touch ${XSOCK}
|
||||
}
|
||||
|
||||
prepare_container_volume_parameters() {
|
||||
if [ -d "/home/$TEAMS_DESKTOP_USER/X/teamsTwo/" ]; then
|
||||
rm -rf "/home/$TEAMS_DESKTOP_USER/X/teamsTwo/"
|
||||
fi
|
||||
create_x_folder
|
||||
|
||||
xauth nlist :0 | sed -e 's/^..../ffff/' | xauth -f ${XAUTH} nmerge -
|
||||
|
||||
VOLUMES+=" --volume=${CONFIG_PATH}:/home/${TEAMS_DESKTOP_USER}/.config/Microsoft/"
|
||||
@@ -79,7 +98,7 @@ prepare_docker_volume_parameters() {
|
||||
|
||||
}
|
||||
|
||||
prepare_docker_device_parameters() {
|
||||
prepare_container_device_parameters() {
|
||||
# enumerate video devices for webcam support
|
||||
VIDEO_DEVICES=
|
||||
for device in /dev/video*; do
|
||||
@@ -109,24 +128,21 @@ elif [[ -n ${exec} ]]; then
|
||||
fi
|
||||
|
||||
cleanup_stopped_teams_desktop_instances
|
||||
prepare_docker_env_parameters
|
||||
prepare_docker_volume_parameters
|
||||
prepare_docker_device_parameters
|
||||
prepare_container_env_parameters
|
||||
prepare_container_volume_parameters
|
||||
prepare_container_device_parameters
|
||||
|
||||
echo "Starting ${prog}..."
|
||||
${SUDO} docker run -d \
|
||||
set -o xtrace
|
||||
${SUDO} ${CONTAINER_ENGINE} run -d \
|
||||
--name ${CONTAINER_NAME} \
|
||||
--network host \
|
||||
--privileged \
|
||||
--memory=8g \
|
||||
--shm-size=8g \
|
||||
--memory=4g \
|
||||
--shm-size=4g \
|
||||
--device /dev/dri \
|
||||
--device /dev/snd \
|
||||
--cap-add=SYS_ADMIN \
|
||||
-v /tmp/.X11-unix:/tmp/.X11-unix \
|
||||
-e DISPLAY=unix$DISPLAY \
|
||||
${ENV_VARS} \
|
||||
${VIDEO_DEVICES} \
|
||||
${VOLUMES} \
|
||||
${TEAMS_EXTRA_DOCKER_ARGUMENTS} \
|
||||
${IMAGE_NAME} ${prog} $@ >/dev/null
|
||||
${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
|
||||
${IMAGE_NAME} ${prog} $@ >/dev/null
|
||||
|
||||
Reference in New Issue
Block a user