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

Docker provider: catch container name when using podman. #11356

Merged
merged 1 commit into from Mar 30, 2020

Conversation

jackorp
Copy link
Contributor

@jackorp jackorp commented Jan 31, 2020

When user is using podman's docker CLI emulation the containers would
fail to enter running state because the docker driver could not catch
the container name. This commit fixes that by adding a check if podman
docker emulation is used and pick the container hash correctly from the
output.

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 31, 2020

CLA assistant check
All committers have signed the CLA.

@pvalena
Copy link
Contributor

pvalena commented Jan 31, 2020

LGTM.

@pvalena
Copy link
Contributor

pvalena commented Jan 31, 2020

Note: this is using docker executable(wrapper) for podman from package podman-docker on Fedora / CentOS.

pvalena
pvalena previously approved these changes Feb 11, 2020
Copy link
Contributor

@pvalena pvalena left a comment

Choose a reason for hiding this comment

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

I like how unintrusive it is. Maybe there'll be more changes needed, but I'll test it in Fedora.

@jackorp jackorp force-pushed the vagrant-podman-container-build branch 2 times, most recently from 577475f to a170709 Compare February 12, 2020 09:18
pvalena
pvalena previously approved these changes Feb 12, 2020
Copy link
Contributor

@pvalena pvalena left a comment

Choose a reason for hiding this comment

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

Even better. This allows for any output that has 64-char hashes.

@jackorp jackorp force-pushed the vagrant-podman-container-build branch 2 times, most recently from 7adf7b6 to eb30324 Compare February 17, 2020 21:52
@jackorp
Copy link
Contributor Author

jackorp commented Feb 17, 2020

Deleted extra newline.

plugins/providers/docker/driver.rb Outdated Show resolved Hide resolved
When user is using podman's docker CLI emulation the containers would
fail to enter running state because the docker driver could not catch
the container name. This commit fixes that by adding a check if podman
docker emulation is used and pick the container hash correctly from the
output.
@jackorp jackorp force-pushed the vagrant-podman-container-build branch from eb30324 to 5208032 Compare March 25, 2020 19:50
@soapy1 soapy1 merged commit 0ca53d9 into hashicorp:master Mar 30, 2020
@ghost
Copy link

ghost commented Apr 30, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@hashicorp hashicorp locked and limited conversation to collaborators Apr 30, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants