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

[19.03 backport] Integration: change signatures to fix golint warnings - #281

Merged
andrewhsu merged 8 commits into
docker-archive:19.03from
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged

[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from
thaJeztah:19.03_backport_fix_golint_again

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Jun 14, 2019•
edited
Loading

Copy link
Copy Markdown
Member

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

@thaJeztahthaJeztah added this to the 19.03.1 milestone Jun 14, 2019
@thaJeztahthaJeztah mentioned this pull request Jun 14, 2019
Merged
@thaJeztahthaJeztah changed the title [19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah

thaJeztah commented Jun 14, 2019

Copy link
Copy Markdown
MemberAuthor

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

@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch from 80576fb to 788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah changed the title [WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah

thaJeztah commented Jul 13, 2019

Copy link
Copy Markdown
MemberAuthor

rebased, now that #279 was merged

@kolyshkin@andrewhsu this is ready for review/merge

@thaJeztahthaJeztah modified the milestones: 19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah modified the milestones: 19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch from 788bbde to f3084e6CompareAugust 9, 2019 01:16
@thaJeztah

thaJeztah commented Aug 9, 2019

Copy link
Copy Markdown
MemberAuthor

rebased again because Jenkins logs were purged

@thaJeztah

thaJeztah commented Aug 9, 2019

Copy link
Copy Markdown
MemberAuthor

@kolyshkin ptal

@thaJeztahthaJeztah mentioned this pull request Aug 13, 2019
Merged
@thaJeztah

thaJeztah commented Aug 13, 2019

Copy link
Copy Markdown
MemberAuthor

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

thaJeztah commented Aug 13, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like that needs moby#39357

@thaJeztah

thaJeztah commented Aug 13, 2019•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch from f3084e6 to 886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah modified the milestones: 19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch 3 times, most recently from 6753a59 to d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch 3 times, most recently from 6d0c47d to e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah mentioned this pull request Sep 21, 2019
Merged
3 tasks
@thaJeztahthaJeztah mentioned this pull request Sep 21, 2019
Merged
@thaJeztah

thaJeztah commented Sep 21, 2019

Copy link
Copy Markdown
MemberAuthor

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

thaJeztahand others added 7 commits September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch from e2411eb to 2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed the 19.03_backport_fix_golint_again branch from 2cc1f4c to 0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu approved these changes Sep 23, 2019
View reviewed changes

@andrewhsuandrewhsu left a comment

Copy link
Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah deleted the 19.03_backport_fix_golint_again branch September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer
@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

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

[19.03 backport] Integration: change signatures to fix golint warnings - #281
Merged
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings#281
andrewhsu merged 8 commits into
docker-archive:19.03from 
thaJeztah:19.03_backport_fix_golint_again
Conversation
@thaJeztah
@thaJeztahthaJeztah
commented
Jun 14, 2019•

edited

Loading

Copy link


Copy Markdown

Member
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
@thaJeztahthaJeztah
added this to the 19.03.1 milestone
Jun 14, 2019
@thaJeztahthaJeztah
mentioned this pull request
Jun 14, 2019
 Merged

@thaJeztahthaJeztah
changed the title
[19.03 backport] Integration: change signatures to fix golint warnings[WIP][19.03 backport] Integration: change signatures to fix golint warningsJun 14, 2019
@thaJeztah
thaJeztah
commented
Jun 14, 2019

Copy link


Copy Markdown

MemberAuthor
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
80576fb to
788bbdeCompareJuly 13, 2019 20:28
@thaJeztahthaJeztah
changed the title
[WIP][19.03 backport] Integration: change signatures to fix golint warnings[19.03 backport] Integration: change signatures to fix golint warningsJul 13, 2019
@thaJeztah
thaJeztah
commented
Jul 13, 2019

Copy link


Copy Markdown

MemberAuthor
rebased, now that #279 was merged
@kolyshkin@andrewhsu this is ready for review/merge
@thaJeztahthaJeztah
modified the milestones:
19.03.1, 19.03.0Jul 13, 2019
@thaJeztahthaJeztah
modified the milestones:
19.03.0, 19.03.1, 19.03.2Jul 23, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
788bbde to
f3084e6CompareAugust 9, 2019 01:16
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
rebased again because Jenkins logs were purged
@thaJeztah
thaJeztah
commented
Aug 9, 2019

Copy link


Copy Markdown

MemberAuthor
@kolyshkin ptal
@thaJeztahthaJeztah
mentioned this pull request
Aug 13, 2019
 Merged

@thaJeztah
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
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
thaJeztah
commented
Aug 13, 2019

Copy link


Copy Markdown

MemberAuthor
Looks like that needs moby#39357
@thaJeztah
thaJeztah
commented
Aug 13, 2019•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
oh, no, I see: needs a revert of 8f4b96f (last commit from #280)
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
f3084e6 to
886a355CompareAugust 13, 2019 15:27
@thaJeztahthaJeztah
modified the milestones:
19.03.2, 19.03.3Aug 30, 2019
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6753a59 to
d25a178CompareSeptember 12, 2019 11:23
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
3 times, most recently
from
6d0c47d to
e2411ebCompareSeptember 20, 2019 17:13
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

3 tasks
@thaJeztahthaJeztah
mentioned this pull request
Sep 21, 2019
 Merged

@thaJeztah
thaJeztah
commented
Sep 21, 2019

Copy link


Copy Markdown

MemberAuthor
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR)
thaJeztahand others
added 7 commits
September 23, 2019 18:20
@thaJeztah
Revert "integration: have container.Create call compile"
235fa0e
This reverts commit 8f4b96f.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
integration: change network.CreateNoError signature to fix linting
9175772
 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>
@thaJeztah
integration: change container.Create signature to fix linting
9c49308
```
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>
@thaJeztah
integration: change container.Run signature to fix linting
3ade7ca
 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>
@thaJeztah
integration: change createAmbiguousNetworks signature to fix linting
3f4338c
 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>
@thaJeztah
integration: change testGraphDriver signature to fix linting
168132b
 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>
Tibor Vass@thaJeztah
integration: get tests to compile again
51f390d
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a281289)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
e2411eb to
2cc1f4cCompareSeptember 23, 2019 16:21
@thaJeztah
Revert "Fixing integration test"
0d6d5b3
This reverts commit 8fca769.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed
the
19.03_backport_fix_golint_again
branch
from
2cc1f4c to
0d6d5b3CompareSeptember 23, 2019 16:22
andrewhsu
andrewhsu
approved these changes
Sep 23, 2019
View reviewed changes
@andrewhsuandrewhsu
left a comment


Copy link


Copy Markdown

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.03Sep 23, 2019
@thaJeztah
thaJeztah
deleted the

19.03_backport_fix_golint_again

branch
September 23, 2019 16:37
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah@andrewhsu