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

Ensure RUN instruction to run without Healthcheck #37413

Merged
merged 1 commit into from Jul 11, 2018

Conversation

@yui-knk
Copy link
Contributor

yui-knk commented Jul 8, 2018

Before this commit Healthcheck run if HEALTHCHECK
instruction appears before RUN instruction.
By passing withoutHealthcheck to copyRunConfig,
always RUN instruction run without Healthcheck.

Fix: #37362

Signed-off-by: Yuichiro Kaneko spiketeika@gmail.com

Before this commit Healthcheck run if HEALTHCHECK
instruction appears before RUN instruction.
By passing `withoutHealthcheck` to `copyRunConfig`,
always RUN instruction run without Healthcheck.

Fix: #37362

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Jul 11, 2018

Both experimental (https://jenkins.dockerproject.org/job/Docker-PRs-experimental/41253/console) and Janky (https://jenkins.dockerproject.org/job/Docker-PRs/50020/console) failing on a flaky test; #32673

restarting CI for those

09:20:04 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
09:20:04 
09:20:04 [d30385aa8c4ec] waiting for daemon to start
09:20:04 [d30385aa8c4ec] daemon started
09:20:04 
09:20:04 [d9cffcf1f5577] waiting for daemon to start
09:20:04 [d9cffcf1f5577] daemon started
09:20:04 
09:20:04 [dcf48364a2cc1] waiting for daemon to start
09:20:04 [dcf48364a2cc1] daemon started
09:20:04 
09:20:04 [d30385aa8c4ec] exiting daemon
09:20:04 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
09:20:04 [d9cffcf1f5577] exiting daemon
09:20:04 [dcf48364a2cc1] exiting daemon
Copy link
Member

thaJeztah left a comment

gave this a test, and looks to do the right thing (also wanted to be sure it wouldn't commit the NONE to the final image, but that seems to be working.

SGTM, but would like reviews from @tonistiigi and/or @AkihiroSuda

@codecov

This comment has been minimized.

Copy link

codecov bot commented Jul 11, 2018

Codecov Report

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

@@            Coverage Diff            @@
##             master   #37413   +/-   ##
=========================================
  Coverage          ?    34.7%           
=========================================
  Files             ?      610           
  Lines             ?    45202           
  Branches          ?        0           
=========================================
  Hits              ?    15689           
  Misses            ?    27391           
  Partials          ?     2122
@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Jul 11, 2018

All green, let's merge, thanks so much !

@thaJeztah thaJeztah merged commit f0585d0 into moby:master Jul 11, 2018
8 checks passed
8 checks passed
codecov/patch 100% of diff hit (target 50%)
Details
codecov/project No report found to compare against
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 41284 has succeeded
Details
janky Jenkins build Docker-PRs 50056 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 10436 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 21364 has succeeded
Details
z Jenkins build Docker-PRs-s390x 10324 has succeeded
Details
@yui-knk yui-knk deleted the yui-knk:do_not_Healthcheck_RUN_command branch Jul 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.