Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat #3131

Merged
merged 1 commit into from
Jun 21, 2021
Merged

vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat #3131

merged 1 commit into from
Jun 21, 2021

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 10, 2021 •
edited
Loading

Relates to:

Changes:

  • winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
  • winterm: fix GetStdFile() falltrough
  • update deprecation message to refer to the correct replacement
  • add go.mod
  • Fix int overflow
  • Convert int to string using rune()

full diff:

- Description for the changelog

Fix Invalid Standard Handle Panic on Windows

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the 21.xx milestone Jun 10, 2021
@thaJeztah thaJeztah mentioned this pull request Jun 10, 2021
Merged
@thaJeztah thaJeztah mentioned this pull request Jun 10, 2021
Merged
@thaJeztah
Copy link
Member Author

Hmmm... looks like there's an issue with the update;

#16 [linux/amd64 build 1/1] RUN --mount=ro --mount=type=cache,target=/root/.cache     --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk     --mount=type=tmpfs,target=cli/winresources     xx-go --wrap &&     TARGET=/out ./scripts/build/binary &&     xx-verify $([ "static" = "static" ] && echo "--static") /out/docker
#16 sha256:a6446b9723191a7295c81102f25b1152af7d939645cf010f5d08180927fe0a80
#16 1.834 Building static docker-windows-arm-v7.exe
#16 110.1 # github.com/docker/cli/vendor/github.com/Azure/go-ansiterm/winterm
#16 110.1 vendor/github.com/Azure/go-ansiterm/winterm/ansi.go:167:2: constant 4294967286 overflows int
#16 110.1 vendor/github.com/Azure/go-ansiterm/winterm/ansi.go:169:2: constant 4294967285 overflows int
#16 110.1 vendor/github.com/Azure/go-ansiterm/winterm/ansi.go:171:2: constant 4294967284 overflows int
#16 ...

@thaJeztah thaJeztah force-pushed the bump_term_ansiterm branch 3 times, most recently from 86804bf to 97da45d Compare June 14, 2021 11:28
@thaJeztah thaJeztah marked this pull request as draft June 14, 2021 15:06
@thaJeztah
Copy link
Member Author

I'll update once moby/term#29 is merged

@thaJeztah
vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat
b5bc279 
Changes:

- winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
- winterm: fix GetStdFile() falltrough
- update deprecation message to refer to the correct replacement
- add go.mod
- Fix int overflow
- Convert int to string using rune()

full diff:

- moby/term@bea5bbe...3f7ff69
- Azure/go-ansiterm@d6e3b33...d185dfc

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

I'll update once moby/term#29 is merged

Updated 👍

@thaJeztah thaJeztah marked this pull request as ready for review June 21, 2021 11:33
@thaJeztah
Copy link
Member Author

@silvin-lubecki PTAL

silvin-lubecki
silvin-lubecki approved these changes Jun 21, 2021
View reviewed changes
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

@silvin-lubecki silvin-lubecki merged commit 347cd40 into docker:master Jun 21, 2021
@thaJeztah thaJeztah deleted the bump_term_ansiterm branch June 21, 2021 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silvin-lubecki silvin-lubecki silvin-lubecki approved these changes

Assignees
No one assigned
Labels
platform/windows process/cherry-picked status/2-code-review
Projects
None yet
Milestone
23.0.0
Development

Successfully merging this pull request may close these issues.

window 10 cmd run docker -v error
2 participants
@thaJeztah @silvin-lubecki