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.

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

vendor: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev #3827

Merged
merged 1 commit into from Oct 21, 2022

Conversation

thaJeztah
Copy link
Member

This restores compatibility with go1.18, which was broken since commit; moby/moby@c062238

cmd.Environ() is new in go1.19, and not needed for this specific case. Without this, trying to use this package in code that uses go1.18 will fail;

builder/remotecontext/git/gitutils.go:216:23: cmd.Environ undefined (type *exec.Cmd has no field or method Environ)

Changing to use os.Environ() instead restores compatibility with go1.18

Full diff: moby/moby@f9cb47a...5aac513

This restores compatibility with go1.18, which was broken since commit;
moby/moby@c062238

cmd.Environ() is new in go1.19, and not needed for this specific case.
Without this, trying to use this package in code that uses go1.18 will fail;

    builder/remotecontext/git/gitutils.go:216:23: cmd.Environ undefined (type *exec.Cmd has no field or method Environ)

Changing to use `os.Environ()` instead restores compatibility with go1.18

Full diff: moby/moby@f9cb47a...5aac513

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 22.06.0 milestone Oct 21, 2022
Copy link
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

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

👀

@thaJeztah
Copy link
Member Author

Thx! Let me merge this one

@thaJeztah thaJeztah merged commit 110c4d9 into docker:master Oct 21, 2022
@thaJeztah thaJeztah deleted the go1.18_compat branch October 21, 2022 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants