| Index: third_party/grpc/tools/dockerfile/grpc_base/Dockerfile
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/dockerfile/grpc_base/Dockerfile
|
| similarity index 61%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/tools/dockerfile/grpc_base/Dockerfile
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..91862773d5789bfc3a858a66f84f78283b9decff 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/tools/dockerfile/grpc_base/Dockerfile
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2012, Google Inc.
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,22 +27,42 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +# Base Dockerfile for gRPC dev images
|
| +FROM debian:latest
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| +# Install Git.
|
| +RUN apt-get update && apt-get install -y \
|
| + autoconf \
|
| + autotools-dev \
|
| + build-essential \
|
| + bzip2 \
|
| + curl \
|
| + gcc \
|
| + git \
|
| + libc6 \
|
| + libc6-dbg \
|
| + libc6-dev \
|
| + libgtest-dev \
|
| + libtool \
|
| + make \
|
| + strace \
|
| + python-dev \
|
| + python-setuptools \
|
| + telnet \
|
| + unzip \
|
| + wget \
|
| + zip && apt-get clean
|
|
|
| +# Install useful useful python modules
|
| +RUN easy_install -U pip
|
| +RUN pip install -U crcmod # makes downloads from cloud storage faster
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| +# Install GCloud
|
| +RUN wget https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.zip \
|
| + && unzip google-cloud-sdk.zip && rm google-cloud-sdk.zip
|
| +ENV CLOUD_SDK /google-cloud-sdk
|
| +RUN $CLOUD_SDK/install.sh --usage-reporting=true --path-update=true --bash-completion=true --rc-path=/.bashrc --disable-installation-options
|
| +ENV PATH $CLOUD_SDK/bin:$PATH
|
|
|
| -
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = request.ws_stream.receive_message()
|
| - if line is None:
|
| - return
|
| - if isinstance(line, unicode):
|
| - request.ws_stream.send_message(line, binary=False)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| - else:
|
| - request.ws_stream.send_message(line, binary=True)
|
| +# Define the default command.
|
| +CMD ["bash"]
|
|
|