third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile - Issue 1932353002: Initial checkin of gRPC to third_party/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

Issue 1932353002: Initial checkin of gRPC to third_party/ Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/grpc/tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile ('k') | third_party/grpc/tools/dockerfile/distribtest/python_fedora22_x64/Dockerfile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

similarity index 73%

copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py

copy to third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..f1b0e2f4b223634ee6ad232202fdbc71d4579989 100644

--- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py

+++ b/third_party/grpc/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

@@ -1,4 +1,4 @@

# Redistribution and use in source and binary forms, with or without

@@ -27,20 +27,16 @@

# (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 fedora:21

-from mod_pywebsocket import msgutil

+# Make yum work properly under docker when using overlay storage driver.

+# https://bugzilla.redhat.com/show_bug.cgi?id=1213602#c9

+# https://github.com/docker/docker/issues/10180

+RUN yum install -y yum-plugin-ovl

+RUN yum clean all && yum update -y && yum install -y python python-pip

-_GOODBYE_MESSAGE = 'Goodbye'

-def web_socket_do_extra_handshake(request):

- pass # Always accept.

-def web_socket_transfer_data(request):

- while True:

- line = msgutil.receive_message(request)

- msgutil.send_message(request, line)

- if line == _GOODBYE_MESSAGE:

- return

+# Upgrading six would fail because of docker issue when using overlay.

+# Trying twice makes it work fine.

+# https://github.com/docker/docker/issues/10180

+RUN pip2 install --upgrade six || pip2 install --upgrade six