| Index: third_party/grpc/tools/dockerfile/grpc_interop_java/Dockerfile
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/dockerfile/grpc_interop_java/Dockerfile
|
| similarity index 56%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/tools/dockerfile/grpc_interop_java/Dockerfile
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..8bfb796c24be88e4cc7ba90c24a7d85a971dbc8f 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/tools/dockerfile/grpc_interop_java/Dockerfile
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2012, Google Inc.
|
| +# Copyright 2015-2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,22 +27,32 @@
|
| # (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 debian:jessie
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| -
|
| +# Install JDK 8 and Git
|
| +#
|
| +# TODO(temiola): simplify this if/when a simpler process is available.
|
| +#
|
| +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
|
| + echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
|
| + echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
|
| + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
|
| + apt-get update && \
|
| + apt-get -y install \
|
| + git \
|
| + libapr1 \
|
| + oracle-java8-installer \
|
| + && \
|
| + apt-get clean && rm -r /var/cache/oracle-jdk8-installer/
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
|
| +ENV PATH $PATH:$JAVA_HOME/bin
|
|
|
| +# Trigger download of as many Gradle artifacts as possible.
|
| +RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && \
|
| + cd grpc-java && \
|
| + ./gradlew :grpc-interop-testing:installDist -PskipCodegen=true && \
|
| + rm -r "$(pwd)"
|
|
|
| -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"]
|
|
|