| Index: third_party/grpc/tools/dockerfile/grpc_interop_http2/Dockerfile
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py b/third_party/grpc/tools/dockerfile/grpc_interop_http2/Dockerfile
|
| similarity index 87%
|
| copy from third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py
|
| copy to third_party/grpc/tools/dockerfile/grpc_interop_http2/Dockerfile
|
| index a37bd31d9bfd498549dc9b1bf28a6b8c002bbf12..f83e18c8a3182b0488e93b30b82e1489728aa17b 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py
|
| +++ b/third_party/grpc/tools/dockerfile/grpc_interop_http2/Dockerfile
|
| @@ -1,4 +1,5 @@
|
| -# Copyright (C) 2011 Google Inc. All rights reserved.
|
| +# Copyright 2015-2016, Google Inc.
|
| +# All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| # modification, are permitted provided that the following conditions are
|
| @@ -26,11 +27,10 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +FROM golang:1.4
|
|
|
| -class Environment(object):
|
| +# Using login shell removes Go from path, so we add it.
|
| +RUN ln -s /usr/src/go/bin/go /usr/local/bin
|
|
|
| - def __init__(self, env=None):
|
| - self.env = env or {}
|
| -
|
| - def to_dictionary(self):
|
| - return self.env
|
| +# Define the default command.
|
| +CMD ["bash"]
|
|
|