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

[18.02] revert attach: Use ContainerWait instead of Inspect - #406

Merged
andrewhsu merged 2 commits into
docker-archive:18.02from
andrewhsu:qq
Jan 31, 2018
Merged

[18.02] revert attach: Use ContainerWait instead of Inspect#406
andrewhsu merged 2 commits into
docker-archive:18.02from
andrewhsu:qq

Conversation

@andrewhsu

@andrewhsu andrewhsu commented Jan 31, 2018

Copy link
Copy Markdown
Contributor

revert:

to address failures like:

panic: DockerSuite.TestAttachAfterDetach test timed out after 5m0s [recovered]
	panic: DockerSuite.TestAttachAfterDetach test timed out after 5m0s

reverting git commits 3acd490 1a65d7d:

$ git revert 3acd490 1a65d7d

only conflict on cli/command/container/attach_test.go which i removed to resolve

@GordonTheTurtle

Copy link
Copy Markdown
Contributor

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "qq" git@github.com:andrewhsu/docker-ce.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354562416
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

This reverts commit 3acd490.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
This reverts commit 1a65d7d.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu changed the title WIP testing something [18.02] revert attach: Use ContainerWait instead of Inspect Jan 31, 2018
@andrewhsu
andrewhsu requested a review from thaJeztah January 31, 2018 04:48
@andrewhsu andrewhsu added this to the 18.02.0 milestone Jan 31, 2018
@andrewhsu
andrewhsu requested a review from seemethere January 31, 2018 04:55

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM for 18.02

@andrewhsu
andrewhsu merged commit 24653a8 into docker-archive:18.02 Jan 31, 2018
@andrewhsu
andrewhsu deleted the qq branch January 31, 2018 05:42
@mlaventure

Copy link
Copy Markdown
Contributor

Given that it didn't occur until now, there may be a regression somewhere else 😇

@thaJeztah

Copy link
Copy Markdown
Member

@mlaventure Yes, we should look into that; I discussed with @andrewhsu, and given that the issue it's fixing was already in previous releases, we deemed it was better to revert for this release, and look into the issue for the next release

cpuguy83 pushed a commit to cpuguy83/docker-ce that referenced this pull request Feb 7, 2018
…t_test

adding network list test
Upstream-commit: ec99774a8521f461d7f4ddc75760ff33826cd3ad
Component: cli
docker-jenkins pushed a commit that referenced this pull request Oct 23, 2019
…r_error

[18.09 backport] Propagate GetContainer error from event processor
Upstream-commit: 8f450df69ee9b181e217005bb6a4903db8cf3485
Component: engine
docker-jenkins pushed a commit that referenced this pull request Oct 30, 2019
unir: Remove old maintainers, add new ones
Upstream-commit: 28a0f18
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
unir: Remove old maintainers, add new ones
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants