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

Use golang.org/x/net/context for now #338

Merged
merged 1 commit into from
Oct 31, 2016

Conversation

mlaventure
Copy link
Contributor

We'll move to "context" once the grpc, protobuf and protoc-gen-go packages have
done so (see grpc/grpc-go#711)

This also forced me to manually update tonistiigi/fifo to use the old
context path for now.

This change ensures we stay compatible with go1.6.x

Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com

We'll move to "context" once the grpc, protobuf and protoc-gen-go packages have
done so (see grpc/grpc-go#711)

This also forced me to manually update tonistiigi/fifo to use the old
context path for now.

This change ensures we stay compatible with go1.6.x

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
"io"
"os"
"runtime"
"sync"
"syscall"

"github.com/pkg/errors"
"golang.org/x/net/context"
Copy link
Contributor

Choose a reason for hiding this comment

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

will this work in docker itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

docker still uses golang.org/x/net/context almost everywhere except in 3 files, so it should still work (also, this file wouldn't end up being imported into docker by hack/vendor.sh).

I'll give it a try just to be sure though.

Thanks for pointing it out

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All good! 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

tyvm for testing!

@crosbymichael
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants