Various Fixes for Podman/ Docker

[sHedC]

From the latest have updated to fix the following, mainly for podman but tested with both docker and podman on xwayland, x11, wayland in both KDE (Manjaro) and Gnome (Fedora).

• podman/ docker now detected in entrypoint and script split to start correctly.
• properly supports xwayland using xAuthority
• fixed permissions when setting up new zwift user volume for podman
• added ability to specify user and group id in podman
• can locally build and run in podman using bin/test-build.sh (also works for docker)
• fixed entrypoint for docker initial build when using same userid as host
• fixed passing of arguments from test-build.sh and zwift scripts

Wayland i tried to fix, it starts wine notepad however zwift complains about screen size and doesn't work correctly.

[netbrain]

Your bash skills are a notch above mine 👍

lgtm,. however one question.

[netbrain]

@hobeone do you have any inputs on this?

[hobeone]

Only other input is Thank You for doing all of this!

[sHedC]

Your bash skills are a notch above mine 👍

lgtm,. however one question.

I have been coding for over 35 years, I actually was trying not to change too much :)
I am more than happy to help with Podman integration and Wayland as this is what I use for my other developments.

[sHedC]

Fixed the comments above, I have updated bin/test_build.sh to trap for errors and clean up after (annoying if you have to manually delete the container on failure).

I didn't update the bin/build.sh but the test one should work for both Podman and Docker, if you are happy I will move it into build.sh and update the readme.

I am just running docker tests now.

[sHedC]

There is an issue with the docker and using a different ZWIFT_UID/ GID, checking it.

[sHedC]

Ok docker is working but when I try using a different ZWIFT_UID/GID I get an error later when starting, this might just be because I am not using it right as not sure why it would be used.

The entrypoint is setting all the permissions correctly and setting up the right mapping. Can you seee if that part works?

[hobeone]

What error are you seeing?

[sHedC]

What error are you seeing?

[netbrain]

Looks like an error from the runfromprocess-rs binary. @quietvoid

[sHedC]

This is only when I put ZWIFT_UID and ZWIFT_GID different to my local id of 1000. Without setting those it works fine.

[sHedC]

ok got it, because I mount /run/user/??? directly it is not setting the ownership correctly. Problem is /run/user//?? is neede for wayland, need to re-adjust.

[sHedC]

Have changed it back a bit, so basically to use Wayland or XWayland we need to map /run/user/xxxx, however doing this means you can not change ownership of /run/user/xxxx to the UID/ GID provided in ZWIFT_UID and GID.

So in short at the moment if you use ZWIFT_UID / GID you have to use X11, but wayland works for default.

Will look into this more but fixed to Podman/ Docker works with defefault in Wayland and X11 but adding ZWIFT_UID/GID requires using X11

[sHedC]

Found a couple of minor issues with podman savng documents and sound since fixing the ZWIFT_UID issue.

[netbrain]

Nice, is it all done now or are there any remaining issues?

[sHedC]

Nice, is it all done now or are there any remaining issues?

Just testing and one more I notice the update script should e reversed, "UPDATE" should be checked after install is checked.

[sHedC]

Fixed Tested with ZWIFT_UID and docker (podman fails for some weird reson but nearly works)
Fix Audio on Docker
Build now supports docker and podman
Fixed Podman permissions

Tested everything I can

[netbrain]

A few questions & clarifications.

[sHedC]

Weirdly Podman now supports using ZWIFT_UID under X11 not sure how that happened.

[sHedC]

I this all good now anything else you notice?

[netbrain]

What is the reasoning behind the different names? i.e why when podman you have localhost/zwift instead of netbrain/zwift? relic from testing?

[sHedC]

What is the reasoning behind the different names? i.e why when podman you have localhost/zwift instead of netbrain/zwift? relic from testing?

Think you missed my answer or it's not commenting properly from my phone.

Podman always prefixes with localhost automatically unless you build against a real domain. So wasn't really a choice to use localhost for podman local build.

[netbrain]

Thanks for your contribution, The community appreciates it!

[netbrain]

Just got around to test this myself now, seems to work well. 👏 Have released this as a new image built from scratch. So for the next upcoming releases we'll see if the updating routine works aswell.

[sHedC]

Just got around to test this myself now, seems to work well. 👏 Have released this as a new image built from scratch. So for the next upcoming releases we'll see if the updating routine works aswell.

Perfect glad I can help i am more than willing to help in the future I use this a few times a week and it was one of the last things I used windows for, really appreciate the effort you have all putin to make this work so happy I can assist.

[netbrain]

Happy to hear! 🤗