You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Added docker support to installation. Need to run setup or quickstart with --docker flag to enable.
Additional suggestions before publishing:
Remove container script must be updated to account for docker
Incorporate the feature in README in the desired format.
Additional fix:
Waiting for app to stop rather than arbitrarily killing xfreerdp after 30 seconds.
Please also feel free to test and let me know if anything needs changing :)
Hi, thanks for the PR. I'm not opposed to adding Docker support, but I want to make sure that nothing breaks for Podman users. A few questions:
Why this check removed from linoffice.sh?
if [[ -x "/usr/bin/podman-compose" ]]; then
COMPOSE_COMMAND="/usr/bin/podman-compose"
echo "Using system podman-compose from /usr/bin/"
elif command -v podman-compose &>/dev/null; then
COMPOSE_COMMAND="podman-compose"
echo "Using podman-compose from PATH""
and replaced with:
if ! command -v "$COMPOSE_COMMAND" &>/dev/null; then
The reason for the original code was that while I was experimenting with the quickstart script, it then wanted to use a version of podman-compose installed by pip that didn't actually work for whatever reason, while my system podman-compose was available and working. So this was meant to be defaulting to the system version if available as this should generally be preferable to use.
Why did you remove these things from compose.yaml:
sed -i 's/:Z//g; s/:z//g' "$COMPOSE_FILE"
sed -i '/^[[:space:]]*annotations:/,/^[[:space:]]*[^[:space:]]/{
/^[[:space:]]*annotations:/d
/^[[:space:]]*run\.oci\.keep_original_groups:/d
}' "$COMPOSE_FILE"
sed -i '/^[[:space:]]*group_add:/,/^[[:space:]]*[^[:space:]]/{
/^[[:space:]]*group_add:/d
/^[[:space:]]*-[[:space:]]*keep-groups/d
If these are not necessary for Docker, can this be removed only if the engine is set to Docker? Some user had problems with SELinux errors without the :z labels, and the keep-groups stuff is needed for rootless podman.
What's the rationale behind: Waiting for app to stop rather than arbitrarily killing xfreerdp after 30 seconds? (in the freerdp process cleanup section in in linoffice.sh) What if a FreeRDP process hangs?
Can you remove the engine.txt for the PR because by default it should still use podman?
Would you be able to implement removing the docker container and its volume in the uninstall scripts (uninstall.sh and gui/installer/remove_container.sh) in the same way it's done for podman?
Finally is there anything else you think could affect Podman users?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added docker support to installation. Need to run setup or quickstart with
--dockerflag to enable.Additional suggestions before publishing:
Additional fix:
Please also feel free to test and let me know if anything needs changing :)