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 ContainerRuntimeUtil.ContainerRuntime#isPodman check #37576

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

zakkak
Copy link
Contributor

@zakkak zakkak commented Dec 7, 2023

Carelessly broke it in #37389

Copy link
Member

@yrodiere yrodiere left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

Note I didn't check against my reproducer that this fixed the problem, because I'm currently working on another branch and can't rebuild Quarkus. But I assume you did :)

@yrodiere
Copy link
Member

yrodiere commented Dec 7, 2023

It's odd that our integration tests didn't catch this though 🤔

@zakkak
Copy link
Contributor Author

zakkak commented Dec 7, 2023

It's odd that our integration tests didn't catch this though 🤔

They use docker, not rootless podman :/

But I assume you did :)

Yes I did :)

@zakkak zakkak added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Dec 7, 2023
Copy link

quarkus-bot bot commented Dec 7, 2023

✔️ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

@gsmet gsmet merged commit b12e61e into quarkusio:main Dec 7, 2023
@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Dec 7, 2023
@zakkak zakkak deleted the 2023-12-07-fix-podman-rootless-builds branch December 7, 2023 14:26
@johnmanko
Copy link

@zakkak This is just for my own curiosity, but does the docker test (.equals) differ from how podman is checked (==)?

@zakkak
Copy link
Contributor Author

zakkak commented Dec 7, 2023

@johnmanko yes, the isDocker check changed to be more "inclusive" and avoid having it look like:

return this == DOCKER || this == DOCKER_ROOTLESS || this == WSL || this == WSL_ROOTLESS;

The reason I didn't want to change isPodman (despite I ended up doing that by mistake) as well was to minimize the delta (in retrospect that didn't go that well though 😅 )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants