Index: third_party/grpc/tools/dockerfile/grpc_artifact_protoc/Dockerfile |
diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/dockerfile/grpc_artifact_protoc/Dockerfile |
similarity index 50% |
copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
copy to third_party/grpc/tools/dockerfile/grpc_artifact_protoc/Dockerfile |
index 4206831cb5135d5e03928bf9d995b2bf9e156018..1bbc6e021bc67a6d2419bef498485704f86bcda3 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
+++ b/third_party/grpc/tools/dockerfile/grpc_artifact_protoc/Dockerfile |
@@ -1,4 +1,4 @@ |
-# Copyright 2012, Google Inc. |
+# Copyright 2016, Google Inc. |
# All rights reserved. |
# |
# Redistribution and use in source and binary forms, with or without |
@@ -27,22 +27,37 @@ |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+# Docker file for building protoc and gRPC protoc plugin artifacts. |
+# forked from https://github.com/google/protobuf/blob/master/protoc-artifacts/Dockerfile |
-_GOODBYE_MESSAGE = u'Goodbye' |
+FROM centos:6.6 |
+RUN yum install -y git \ |
+ tar \ |
+ wget \ |
+ make \ |
+ autoconf \ |
+ curl-devel \ |
+ unzip \ |
+ automake \ |
+ libtool \ |
+ glibc-static.i686 \ |
+ glibc-devel \ |
+ glibc-devel.i686 |
-def web_socket_do_extra_handshake(request): |
- request.ws_extension_processors = [] |
+# Install GCC 4.7 to support -static-libstdc++ |
+RUN wget http://people.centos.org/tru/devtools-1.1/devtools-1.1.repo -P /etc/yum.repos.d |
+RUN bash -c 'echo "enabled=1" >> /etc/yum.repos.d/devtools-1.1.repo' |
+RUN bash -c "sed -e 's/\$basearch/i386/g' /etc/yum.repos.d/devtools-1.1.repo > /etc/yum.repos.d/devtools-i386-1.1.repo" |
+RUN sed -e 's/testing-/testing-i386-/g' -i /etc/yum.repos.d/devtools-i386-1.1.repo |
+# We'll get and "Rpmdb checksum is invalid: dCDPT(pkg checksums)" error caused by |
+# docker issue when using overlay storage driver, but all the stuff we need |
+# will be installed, so for now we just ignore the error. |
+# https://github.com/docker/docker/issues/10180 |
+RUN yum install -y devtoolset-1.1 \ |
+ devtoolset-1.1-libstdc++-devel \ |
+ devtoolset-1.1-libstdc++-devel.i686 || true |
-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) |
+# Start in devtoolset environment that uses GCC 4.7 |
+CMD ["scl", "enable", "devtoolset-1.1", "bash"] |