Feature/podman (#3)

* 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

* added podman explanation to readme

* improved the runtime_switching experience

* fixed path mistake in env loading

host-scripts/teams-wrapper

@@ -9,16 +9,23 @@ IMAGE_NAME="docker.io/stifstof/teams-desktop:latest"
 CONTAINER_NAME="teams"
 CONFIG_PATH="${HOME}/.config/Microsoft"
 
+########## Script
+
 # Container runtime (docker or podman)
 CONTAINER_ENGINE="${CONTAINER_ENGINE}"
+# Local .env
+if [ -f "/home/$LOCAL_COMPUTER_USERNAME/Documents/git/TeamsInDocker/.env" ]; then
+    # Load Environment Variables
+    export $(cat /home/$LOCAL_COMPUTER_USERNAME/Documents/git/TeamsInDocker/.env | grep -v '#' | awk '/=/ {print $1}')
+    # For instance, will be example_kaggle_key
+    echo $CONTAINER_ENGINE
+fi
 if [ -z "$CONTAINER_ENGINE" ]
 then
-  echo "\$CONTAINER_ENGINE is empty. Defaulting to podman"
-  CONTAINER_ENGINE="podman"
+  echo "\$CONTAINER_ENGINE is empty. Defaulting to docker"
+  CONTAINER_ENGINE="docker"
 fi
 
-########## Script
-
 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
@@ -63,6 +70,12 @@ cleanup_stopped_teams_desktop_instances() {
   done
 }
 
+prepare_extra_arguments() {
+  if [ "$CONTAINER_ENGINE" == "docker" ]; then
+    TEAMS_EXTRA_CONTAINER_ARGUMENTS+="--privileged"
+  fi
+}
+
 prepare_container_env_parameters() {
   ENV_VARS+=" --env=USER_UID=${USER_UID}"
   ENV_VARS+=" --env=USER_GID=${USER_GID}"
@@ -131,6 +144,7 @@ cleanup_stopped_teams_desktop_instances
 prepare_container_env_parameters
 prepare_container_volume_parameters
 prepare_container_device_parameters
+prepare_extra_arguments
 
 echo "Starting ${prog}..."
 set -o xtrace
@@ -141,8 +155,8 @@ ${SUDO} ${CONTAINER_ENGINE} run -d \
   --shm-size=4g \
   --device /dev/dri \
   --device /dev/snd \
+  ${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
   ${ENV_VARS} \
   ${VIDEO_DEVICES} \
   ${VOLUMES} \
-  ${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
   ${IMAGE_NAME} ${prog} $@ >/dev/null

host-scripts/teams-wrapper-two

@@ -9,16 +9,23 @@ IMAGE_NAME="docker.io/stifstof/teams-desktop:latest"
 CONTAINER_NAME="teams-two"
 CONFIG_PATH="${HOME}/.config/MicrosoftTwo"
 
+########## Script
+
 # Container runtime (docker or podman)
 CONTAINER_ENGINE="${CONTAINER_ENGINE}"
+# Local .env
+if [ -f "/home/$LOCAL_COMPUTER_USERNAME/Documents/git/TeamsInDocker/.env" ]; then
+    # Load Environment Variables
+    export $(cat /home/$LOCAL_COMPUTER_USERNAME/Documents/git/TeamsInDocker/.env | grep -v '#' | awk '/=/ {print $1}')
+    # For instance, will be example_kaggle_key
+    echo $CONTAINER_ENGINE
+fi
 if [ -z "$CONTAINER_ENGINE" ]
 then
-  echo "\$CONTAINER_ENGINE is empty. Defaulting to podman"
-  CONTAINER_ENGINE="podman"
+  echo "\$CONTAINER_ENGINE is empty. Defaulting to docker"
+  CONTAINER_ENGINE="docker"
 fi
 
-########## Script
-
 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
@@ -63,6 +70,12 @@ cleanup_stopped_teams_desktop_instances() {
   done
 }
 
+prepare_extra_arguments() {
+  if [ "$CONTAINER_ENGINE" == "docker" ]; then
+    TEAMS_EXTRA_CONTAINER_ARGUMENTS+="--privileged"
+  fi
+}
+
 prepare_container_env_parameters() {
   ENV_VARS+=" --env=USER_UID=${USER_UID}"
   ENV_VARS+=" --env=USER_GID=${USER_GID}"
@@ -131,6 +144,7 @@ cleanup_stopped_teams_desktop_instances
 prepare_container_env_parameters
 prepare_container_volume_parameters
 prepare_container_device_parameters
+prepare_extra_arguments
 
 echo "Starting ${prog}..."
 set -o xtrace
@@ -141,8 +155,8 @@ ${SUDO} ${CONTAINER_ENGINE} run -d \
   --shm-size=4g \
   --device /dev/dri \
   --device /dev/snd \
+  ${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
   ${ENV_VARS} \
   ${VIDEO_DEVICES} \
   ${VOLUMES} \
-  ${TEAMS_EXTRA_CONTAINER_ARGUMENTS} \
   ${IMAGE_NAME} ${prog} $@ >/dev/null