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.

Sign up for GitHub

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

Jump to bottom

Improve parser for --healthcheck-command #3574

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Improve parser for --healthcheck-command #3574

merged 1 commit into from
Jul 15, 2019

Conversation

stefanb2
Copy link
Contributor

  • fix Docker CLI compatibility issue: the --healthcheck-command option
    value should not be split but instead be passed as single string to
    /bin/sh -c <opt>.

  • on the other hand implement the same extension as is already available
    for --entrypoint, i.e. allow the option value to be a JSON array of
    strings. This will make life easier for tools like podman-compose.

Continuation of #3455 & #3507

@stefanb2
Copy link
Contributor Author

@muayyad-alsadi FYI

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 13, 2019
@openshift-ci-robot
Copy link
Collaborator

Hi @stefanb2. Thanks for your PR.

I'm waiting for a containers or openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@stefanb2 stefanb2 force-pushed the topic-health-cmd-parsing branch from 894c448 to dbcfa0f Compare July 13, 2019 16:10
@stefanb2 stefanb2 changed the title Improve parser for --healtcheck-command Improve parser for --healthcheck-command Jul 13, 2019
@stefanb2 stefanb2 force-pushed the topic-health-cmd-parsing branch from dbcfa0f to 4f8b295 Compare July 13, 2019 16:12
@rh-atomic-bot
Copy link
Collaborator

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

@mheon
Copy link
Member

mheon commented Jul 13, 2019

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 13, 2019
mheon
mheon reviewed Jul 13, 2019
View reviewed changes
docs/podman-run.1.md Outdated Show resolved Hide resolved
@mheon
Copy link
Member

mheon commented Jul 13, 2019

/approve

Code LGTM, manpages could use a little touchup

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon, stefanb2

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2019
@stefanb2 stefanb2 force-pushed the topic-health-cmd-parsing branch from 4f8b295 to b56c66c Compare July 13, 2019 17:00
@stefanb2
create: improve parser for --healthcheck-command
e4cba7d 
Fix Docker CLI compatibility issue: the "--healthcheck-command" option
value should not be split but instead be passed as single string to
"CMD-SHELL", i.e. "/bin/sh -c <opt>".

On the other hand implement the same extension as is already available
for "--entrypoint", i.e. allow the option value to be a JSON array of
strings. This will make life easier for tools like podman-compose.

Updated "--healthcheck-command" option values in tests accordingly.

Continuation of containers#3455 & containers#3507

Signed-off-by: Stefan Becker <[email protected]>
@stefanb2 stefanb2 force-pushed the topic-health-cmd-parsing branch from b56c66c to e4cba7d Compare July 14, 2019 07:41
@stefanb2
Copy link
Contributor Author

Instead of again hard-coding /bin/sh -c the latest patch set simply generates the 2-part list "CMD-SHELL", <opt>. This will be translated by runHealthCheck() to /bin/sh -c "<opt>".

@rhatdan
Copy link
Member

rhatdan commented Jul 14, 2019

LGTM

@mheon
Copy link
Member

mheon commented Jul 15, 2019

Nice work, thanks!

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2019
@mheon
Copy link
Member

mheon commented Jul 15, 2019

Test failures look like infra flakes.

/retry

@mheon
Copy link
Member

mheon commented Jul 15, 2019

Oh, oops.
/retest

@mheon
Copy link
Member

mheon commented Jul 15, 2019

Prow seems like it's down.

@mheon
Copy link
Member

mheon commented Jul 15, 2019

/retest

1 similar comment
@mheon
Copy link
Member

mheon commented Jul 15, 2019

/retest

@openshift-merge-robot openshift-merge-robot merged commit d2291ec into containers:master Jul 15, 2019
This was referenced Jul 15, 2019
Merged
Merged
@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 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mheon mheon mheon left review comments

@jwhonce jwhonce Awaiting requested review from jwhonce

@TomSweeneyRedHat TomSweeneyRedHat Awaiting requested review from TomSweeneyRedHat

Assignees

@mheon mheon

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. ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@stefanb2 @openshift-ci-robot @rh-atomic-bot @mheon @rhatdan @openshift-merge-robot