Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong container runtime detection on Linux #906

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

almet
Copy link
Contributor

@almet almet commented Aug 30, 2024

This is still a work in progress, not ready to be merged.

Fixes #212

@almet almet force-pushed the 212-linux-container-runtime-detection branch from c6be85f to 532fd74 Compare August 30, 2024 15:41
@almet
Copy link
Contributor Author

almet commented Aug 30, 2024

Updated, this now looks like this:

image

This still needs to be more consistent between the different OSes, and probably display the error on other platforms.

dangerzone/gui/main_window.py Outdated Show resolved Hide resolved
dangerzone/gui/main_window.py Outdated Show resolved Hide resolved
@almet almet force-pushed the 212-linux-container-runtime-detection branch from e84c950 to c073a78 Compare September 2, 2024 07:41
@almet
Copy link
Contributor Author

almet commented Sep 2, 2024

This now looks like this:

image

@almet almet force-pushed the 212-linux-container-runtime-detection branch from c073a78 to 8a16be7 Compare September 2, 2024 08:34
@almet almet marked this pull request as ready for review September 6, 2024 09:40
@almet almet force-pushed the 212-linux-container-runtime-detection branch from 8a16be7 to 9c8d25d Compare September 6, 2024 09:49
@almet almet changed the title WIP: Fix wrong container runtime detection on Linux Fix wrong container runtime detection on Linux Sep 6, 2024
@almet
Copy link
Contributor Author

almet commented Sep 9, 2024

While reviewing the issues that should be included in 0.8.0, I found about #193, which is about displaying errors to the end user.

I'm now thinking that the code introduced here to display the logs might be put in a sort of component, to be reused on other parts of the client UI.

@almet almet force-pushed the 212-linux-container-runtime-detection branch 2 times, most recently from 857553c to 18205ab Compare September 11, 2024 13:49
Copy link
Contributor

@apyrgio apyrgio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I have a few small suggestions, and then we're good to merge.

dangerzone/gui/main_window.py Outdated Show resolved Hide resolved
dangerzone/gui/main_window.py Outdated Show resolved Hide resolved
dangerzone/gui/main_window.py Show resolved Hide resolved
@almet almet force-pushed the 212-linux-container-runtime-detection branch 2 times, most recently from bb8bd17 to 933bd7f Compare September 17, 2024 15:51
@apyrgio
Copy link
Contributor

apyrgio commented Sep 17, 2024

Thanks Alexis, feel free to merge, I guess once the CI is working once more.

Use "podman" when on Linux, and "docker" otherwise.

This commit also adds a text widget to the interface, showing the actual
content fo the error that happened, to help debug further if needed.

Fixes #212
@almet almet force-pushed the 212-linux-container-runtime-detection branch from 933bd7f to c3c7fbb Compare September 18, 2024 13:05
@almet almet merged commit c3c7fbb into main Sep 18, 2024
51 checks passed
@almet almet deleted the 212-linux-container-runtime-detection branch September 18, 2024 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong container runtime detection on Linux
3 participants