containers: use 'podman' or 'sudo docker' in unit-tests scripts #12286
Conversation
This file contains 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
allisonkarlitskaya
added
needswork
no-test
allisonkarlitskaya
force-pushed
the
podman-or-sudo-docker
branch
from
558e1ed to
4340849
Compare
|
Needs to rebase to master since #12367 changed tests names |
martinpitt
force-pushed
the
podman-or-sudo-docker
branch
from
4340849 to
e8b8ca5
Compare
|
I rebased this, and reworked it a bit:
I ran containers/unit-tests/build and containers/unit-tests/start locally, and they both succeed with podman as user. |
Detect if we have podman installed and use that in preference to docker. Update the documentation to point out that docker always requires running as root. With podman, the test can be run in a root or user instance. Closes cockpit-project#12286
martinpitt
force-pushed
the
podman-or-sudo-docker
branch
from
e8b8ca5 to
0124798
Compare
|
As I now meddled with this, I don't want to approve myself. @Gundersanne, can you please have a look? Perhaps that's not quite what @allisonkarlitskaya is happy with, but we can always iterate in a follow-up. |
croissanne
approved these changes
Jul 30, 2019
|
@Gundersanne: Yes, that's what you need to do right now in master (e. g. our semaphore tests also run |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Detect if we have podman installed and use that in preference to docker.
If we have only docker, make sure to run it under sudo.
This commit is a little bit ugly, particularly in the 'exec' script: we
can end up running sudo more than once for the normal case where we
detect the ID. I have some weird ideas about how to work around that,
but they're pretty evil.
The sed thing is also pretty nasty.
...