Skip to content

LCOW: fix using wrong shell for healthchecks#39389

Merged
yongtang merged 1 commit intomoby:masterfrom
thaJeztah:fix_LCOW_healthchecks
Jul 6, 2019
Merged

LCOW: fix using wrong shell for healthchecks#39389
yongtang merged 1 commit intomoby:masterfrom
thaJeztah:fix_LCOW_healthchecks

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jun 21, 2019

As reported in docker/compose#6445, when deploying a Linux
container on Windows (LCOW), the daemon made the wrong assumption
when deciding which shell to use to execute the healthcheck, looking
at the host's platform instead of the container's platform.

This patch adds a check for the container's platform when deploying
on Windows, and sets the correct shell.

Fixes docker/compose#6445
Fixes #38577

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

As reported in docker/compose#6445, when deploying a Linux
container on Windows (LCOW), the daemon made the wrong assumption
when deciding which shell to use to execute the healthcheck, looking
at the host's platform instead of the container's platform.

This patch adds a check for the container's platform when deploying
on Windows, and sets the correct shell.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @jhowardmsft @cpuguy83 PTAL

Copy link
Copy Markdown
Member

@lowenna lowenna left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 24, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@52c1667). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master   #39389   +/-   ##
=========================================
  Coverage          ?   37.34%           
=========================================
  Files             ?      609           
  Lines             ?    45211           
  Branches          ?        0           
=========================================
  Hits              ?    16886           
  Misses            ?    26037           
  Partials          ?     2288

Copy link
Copy Markdown
Member

@yongtang yongtang left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

LCOW healthcheck fails Docker compose healthcheck on lcow

4 participants