| Index: third_party/grpc/tools/dockerfile/distribtest/python_arch_x64/Dockerfile
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py b/third_party/grpc/tools/dockerfile/distribtest/python_arch_x64/Dockerfile
|
| similarity index 87%
|
| copy from third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py
|
| copy to third_party/grpc/tools/dockerfile/distribtest/python_arch_x64/Dockerfile
|
| index a37bd31d9bfd498549dc9b1bf28a6b8c002bbf12..c4f2431080e559ace3058308df542e9ed7ab20dd 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/environment.py
|
| +++ b/third_party/grpc/tools/dockerfile/distribtest/python_arch_x64/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 base/archlinux
|
|
|
| -class Environment(object):
|
| +RUN pacman --noconfirm -Syy
|
| +RUN pacman --noconfirm -S openssl
|
| +RUN pacman --noconfirm -S python2
|
| +RUN pacman --noconfirm -S python2-pip
|
|
|
| - def __init__(self, env=None):
|
| - self.env = env or {}
|
| -
|
| - def to_dictionary(self):
|
| - return self.env
|
|
|