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

Fall back to string for dockerfile parameter #10661

Merged
merged 1 commit into from Jun 12, 2021

Conversation

mwhahaha
Copy link
Contributor

a9cb824 changed the expectations of the
dockerfile parameter to be json data however it's a string. In order to
support both, let's attempt json and fall back to a string if the json
parsing fails.

Closes #10660

Signed-off-by: Alex Schultz aschultz@redhat.com

@mheon
Copy link
Member

mheon commented Jun 11, 2021

Can you added a test for this? test/apiv2/10-images.at seems like a natural place.

@mwhahaha
Copy link
Contributor Author

Doesn't look like you can post a file with the apiv2 stuff? I'm looking into it today

@mheon
Copy link
Member

mheon commented Jun 11, 2021

Ahhh. Yeah, the APIv2 tests might be too limited for this.

@mwhahaha
Copy link
Contributor Author

I made it work with apiv2 tests. It's probably easier than trying to implemented it in the python tests but i can move it over there if needed

a9cb824 changed the expectations of the
dockerfile parameter to be json data however it's a string. In order to
support both, let's attempt json and fall back to a string if the json
parsing fails.

Closes containers#10660

Signed-off-by: Alex Schultz <aschultz@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Jun 11, 2021

Awesome work @mwhahaha LGTM

@mheon
Copy link
Member

mheon commented Jun 11, 2021

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 11, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2021
@rhatdan
Copy link
Member

rhatdan commented Jun 11, 2021

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mwhahaha, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2021
@TomSweeneyRedHat
Copy link
Member

LGTM
/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2021
@openshift-merge-robot openshift-merge-robot merged commit c955c95 into containers:master Jun 12, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dockerfile parameter broken in the /v3.1.2/libpod/build api call
5 participants