-
Notifications
You must be signed in to change notification settings - Fork 686
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
Support podman in make dev-tor
#7163
base: develop
Are you sure you want to change the base?
Conversation
9ac0808
to
c9448ca
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for finding this, at the time when I added the onion persistence I guess I did not realize podman was also supported. The solution didn't work for me so I proposed an alternative.
There's also another thing that needs to be provider-agnostic: the make clean.
Thanks for the suggestion, now applied and fixed |
Thanks for the fixes. I was reviewing this but got blocked by #7174. |
The above got resolved. However, I am having further challenges with podman, which seems to be beyond just Here's some truncated part of the output or
Do you know what could be going on? I was on a disposable debian-12 VM on Qubes. Then I installed |
Unfortunately `podman volume` and `docker volume` are not identical, podman will (sensibly) error if you try to create a volume that already exists unless you pass `--ignore`, which docker doesn't support and is only in podman 4.4+. So we check with `$DOCKER_BIN inspect` first and only create the volume if necessary. And apply the same changes to `make clean` as well. Co-authored-by: deeplow <francisco@freedom.press>
fd94d09
to
58705e4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Approving based on visual inspection alone since I can't seem to run this. This a minor dev-facing (non-default) option, so I'd say this can be fine.
However, it would be nice if someone else could test:
- Run
make dev-tor
twice under docker, make sure it works- Run
make dev-tor
twice under podman, make sure it works (I've done this laready)
Status
Ready for review
Description of Changes
Unfortunately
podman volume
anddocker volume
are not identical, podman will (sensibly) error if you try to create a volume that already exists unless you pass--ignore
, which docker doesn't support.So we conditionally add the needed flag depending on which tool we're using.
Testing
make dev-tor
twice under docker, make sure it worksmake dev-tor
twice under podman, make sure it works (I've done this laready)Deployment
Any special considerations for deployment? n/a, dev only
Checklist