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:
committed by
GitHub
parent
16a77bdf18
commit
589d2c5263
45
Makefile
45
Makefile
@@ -1,26 +1,35 @@
|
||||
include .env
|
||||
|
||||
launch:
|
||||
teams-wrapper teams
|
||||
teams-wrapper-two teams
|
||||
|
||||
kill-containers:
|
||||
docker kill teams || docker kill teams-two # if error try kill other instance before exit
|
||||
docker kill teams-two
|
||||
${CONTAINER_ENGINE} kill teams || podman kill teams-two # if error try kill other instance before exit
|
||||
${CONTAINER_ENGINE} kill teams-two
|
||||
|
||||
build:
|
||||
docker build . -t stifstof/teams-desktop:latest
|
||||
${CONTAINER_ENGINE} build -t docker.io/stifstof/teams-desktop:latest -f Containerfile .
|
||||
|
||||
build-no-cache:
|
||||
${CONTAINER_ENGINE} build --no-cache -t docker.io/stifstof/teams-desktop:latest -f Containerfile .
|
||||
|
||||
install:
|
||||
docker run -it --rm \
|
||||
--volume /usr/local/bin:/target \
|
||||
stifstof/teams-desktop:latest install
|
||||
${CONTAINER_ENGINE} run -it --rm --privileged \
|
||||
--volume ./bin:/target \
|
||||
docker.io/stifstof/teams-desktop:latest install
|
||||
|
||||
uninstall:
|
||||
docker run -it --rm \
|
||||
--volume /usr/local/bin:/target \
|
||||
stifstof/teams-desktop:latest uninstall
|
||||
${CONTAINER_ENGINE} run -it --rm --privileged \
|
||||
--volume ./bin:/target \
|
||||
docker.io/stifstof/teams-desktop:latest uninstall
|
||||
|
||||
# convenience jobs
|
||||
|
||||
push:
|
||||
echo ${DOCKERHUB_STIFSTOF_PW} | podman login docker.io -u stifstof --password-stdin
|
||||
${CONTAINER_ENGINE} push docker.io/stifstof/teams-desktop:latest
|
||||
|
||||
reinstall:
|
||||
make uninstall
|
||||
make build
|
||||
@@ -28,4 +37,20 @@ reinstall:
|
||||
|
||||
create-empty-config-folders:
|
||||
mkdir ~/.config/Microsoft
|
||||
mkdir ~/.config/MicrosoftTwo
|
||||
mkdir ~/.config/MicrosoftTwo
|
||||
|
||||
# system setup
|
||||
|
||||
add-to-path:
|
||||
export PATH=$PATH:/home/cn/Documents/git/TeamsInDocker/bin
|
||||
|
||||
podman:
|
||||
rm -f .env
|
||||
echo "CONTAINER_ENGINE=podman" >> .env
|
||||
|
||||
docker:
|
||||
rm -f .env
|
||||
echo "CONTAINER_ENGINE=docker" >> .env
|
||||
|
||||
current_runtime:
|
||||
cat .env
|
||||
Reference in New Issue
Block a user