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

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 14, 2019

Built on top of #279 ("[19.03 backport] Handle the error case when a container reattaches to the same network") first two commits are from that PR

backports of:

Some conflicts in test files when backporting the first PR (moby#39332);

  • conflict in first commit, due to Add alias for hostname if hostname != container name moby/moby#39204 ("Add alias for hostname if hostname != container name") not being in 19.03 (thus a test missing that was being modified)

  • conflict in second commit, due to Start containers in their own cgroup namespaces moby/moby#38377 (Start containers in their own cgroup namespaces) feature not being in 19.03;

    Unmerged paths:
      (use "git add/rm <file>..." as appropriate to mark resolution)
    
    	deleted by us:   integration/container/run_cgroupns_linux_test.go
    	both modified:   integration/internal/container/container.go
    
  • conflict in third commit (due to the same feature missing);

    Unmerged paths:
      (use "git add/rm <file>..." as appropriate to mark resolution)
    
    	deleted by us:   integration/container/run_cgroupns_linux_test.go
    	both modified:   integration/container/run_linux_test.go
    	both modified:   integration/internal/container/container.go
    

Conflicts were not too difficult to resolve

@thaJeztah thaJeztah added this to the 19.03.1 milestone Jun 14, 2019
@thaJeztah thaJeztah changed the title [19.03 backport] Integration: change signatures to fix golint warnings [WIP][19.03 backport] Integration: change signatures to fix golint warnings Jun 14, 2019
@thaJeztah
Copy link
Member Author

Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)

@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch from 80576fb to 788bbde Compare July 13, 2019 20:28
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Integration: change signatures to fix golint warnings [19.03 backport] Integration: change signatures to fix golint warnings Jul 13, 2019
@thaJeztah
Copy link
Member Author

rebased, now that #279 was merged

@kolyshkin @andrewhsu this is ready for review/merge

@thaJeztah thaJeztah modified the milestones: 19.03.1, 19.03.0 Jul 13, 2019
@thaJeztah thaJeztah modified the milestones: 19.03.0, 19.03.1, 19.03.2 Jul 23, 2019
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch from 788bbde to f3084e6 Compare August 9, 2019 01:16
@thaJeztah
Copy link
Member Author

rebased again because Jenkins logs were purged

@thaJeztah
Copy link
Member Author

@kolyshkin ptal

@thaJeztah
Copy link
Member Author

Hm.. might've missed a cherry-pick

01:29:36 # github.com/docker/docker/integration/container [github.com/docker/docker/integration/container.test]
01:29:36 integration/container/copy_test.go:108:25: cannot use t (type *testing.T) as type context.Context in argument to "github.com/docker/docker/integration/internal/container".Create:
01:29:36 	*testing.T does not implement context.Context (missing Deadline method)
01:29:36 integration/container/copy_test.go:108:25: cannot use ctx (type context.Context) as type *testing.T in argument to "github.com/docker/docker/integration/internal/container".Create

@thaJeztah
Copy link
Member Author

Looks like that needs moby#39357

@thaJeztah
Copy link
Member Author

thaJeztah commented Aug 13, 2019

oh, no, I see: needs a revert of 8f4b96f (last commit from #280)

@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch from f3084e6 to 886a355 Compare August 13, 2019 15:27
@thaJeztah thaJeztah modified the milestones: 19.03.2, 19.03.3 Aug 30, 2019
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch 3 times, most recently from 6753a59 to d25a178 Compare September 12, 2019 11:23
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch 3 times, most recently from 6d0c47d to e2411eb Compare September 20, 2019 17:13
@thaJeztah
Copy link
Member Author

this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)

thaJeztah and others added 7 commits September 23, 2019 18:20
This reverts commit 8f4b96f.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    Line 30: warning: context.Context should be the first parameter of a function (golint)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit caec45a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
```
Line 25: warning: context.Context should be the first parameter of a function (golint)
Line 44: warning: context.Context should be the first parameter of a function (golint)
Line 52: warning: context.Context should be the first parameter of a function (golint)
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b4c46b0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    Line 59: warning: context.Context should be the first parameter of a function (golint)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9f9b429)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    Line 30: warning: context.Context should be the first parameter of a function (golint)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 123e29f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    Line 441: warning: context.Context should be the first parameter of a function (golint)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dac5710)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch from e2411eb to 2cc1f4c Compare September 23, 2019 16:21
This reverts commit 8fca769.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_golint_again branch from 2cc1f4c to 0d6d5b3 Compare September 23, 2019 16:22
Copy link

@andrewhsu andrewhsu 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 c5754a7 into docker-archive:19.03 Sep 23, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_golint_again branch September 23, 2019 16:37
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.

2 participants