diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
| commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
| tree | e2b5085817619e9aba3e4f88407f344b36e911af /tools/dockerfile/grpc_ruby_base/Dockerfile | |
| parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
| parent | 8b131922438d96579cb315777ca980e094883496 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'tools/dockerfile/grpc_ruby_base/Dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_ruby_base/Dockerfile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/dockerfile/grpc_ruby_base/Dockerfile b/tools/dockerfile/grpc_ruby_base/Dockerfile index a3a80daf9b..0d872069d7 100644 --- a/tools/dockerfile/grpc_ruby_base/Dockerfile +++ b/tools/dockerfile/grpc_ruby_base/Dockerfile @@ -54,5 +54,10 @@ RUN cd /var/local/git/grpc/third_party/protobuf && \ ./configure --prefix=/usr && \ make -j12 && make check && make install && make clean +# TODO: pre-building seems unnecessary, because we need to run make clean +# anyway to prevent build from crashing if header files are added/removed. # Build the C core RUN make static_c shared_c -j12 -C /var/local/git/grpc + +# Define the default command. +CMD ["bash"] |