Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] Ensure RUN instruction to run without Healthcheck #20

Conversation

thaJeztah
Copy link
Member

backport of moby#37413 for 18.06

git checkout -b 18.06-backport-do_not_Healthcheck_RUN_command ce-engine/18.06 
git cherry-pick -s -S -x 44e08d8a7d1249a1956018c6c3d3655642a4f273

cherry-pick was clean; no conflicts

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

Fix: moby#37362

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

Fix: moby#37362

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
(cherry picked from commit 44e08d8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 11, 2018
@thaJeztah
Copy link
Member Author

Failures on experimental https://jenkins.dockerproject.org/job/Docker-PRs-experimental/41289/console are flaky tests

tracked through moby#32673

19:51:00 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
19:51:00 
19:51:00 [dc04c9833315a] waiting for daemon to start
19:51:00 [dc04c9833315a] daemon started
19:51:00 
19:51:00 [d56fa596cb155] waiting for daemon to start
19:51:00 [d56fa596cb155] daemon started
19:51:00 
19:51:00 [dfb4d50b22a76] waiting for daemon to start
19:51:00 [dfb4d50b22a76] daemon started
19:51:00 
19:51:00 [dc04c9833315a] exiting daemon
19:51:00 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
19:51:00 [d56fa596cb155] exiting daemon
19:51:00 [dfb4d50b22a76] exiting daemon

tracked through moby#37408

19:58:41 FAIL: docker_api_swarm_service_test.go:311: DockerSwarmSuite.TestAPISwarmServicesFailedUpdate
19:58:41 
19:58:41 [dc3d92b27dbc6] waiting for daemon to start
19:58:41 [dc3d92b27dbc6] daemon started
19:58:41 
19:58:41 [dc854584a1379] waiting for daemon to start
19:58:41 [dc854584a1379] daemon started
19:58:41 
19:58:41 [df31cb8c81950] waiting for daemon to start
19:58:41 [df31cb8c81950] daemon started
19:58:41 
19:58:41 docker_api_swarm_service_test.go:347:
19:58:41     waitAndAssert(c, defaultReconciliationTimeout, daemons[0].CheckRunningTaskImages, checker.DeepEquals,
19:58:41         map[string]int{image1: instances})
19:58:41 docker_utils_test.go:435:
19:58:41     c.Assert(v, checker, args...)
19:58:41 ... obtained map[string]int = map[string]int{"busybox:latest":4}
19:58:41 ... expected map[string]int = map[string]int{"busybox:latest":5}
19:58:41 
19:58:41 [dc3d92b27dbc6] exiting daemon
19:58:41 [dc854584a1379] exiting daemon
19:58:41 [df31cb8c81950] exiting daemon

@thaJeztah
Copy link
Member Author

ping @tonistiigi @tiborvass PTAL

Copy link

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 371b590 into docker-archive:18.06 Jul 12, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-do_not_Healthcheck_RUN_command branch July 12, 2018 01:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants