diff options
| author |  Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-02-02 16:31:02 -0800 |
|---|---|---|
| committer | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-02-02 16:31:02 -0800 |
| commit | c0728c44bf90de42b04662d3962fc2b552473c75 (patch) | |
| tree | e9be940be5a8576f87f3242f165be66ffdf8b7ca | |
| parent | 23c8d85e5581a474a17b729265c242de9bebc9f7 (diff) | |
| parent | ea36c97b98c0593d97f4fc6abb702ab34a17040b (diff) | |
Merge pull request #350 from murgatroid99/node_dockerfile_fix
Set leaf dockerfiles to clean C library before rebuilding
| -rw-r--r-- | tools/dockerfile/grpc_node_base/Dockerfile | 3 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_php_base/Dockerfile | 3 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_ruby_base/Dockerfile | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/tools/dockerfile/grpc_node_base/Dockerfile b/tools/dockerfile/grpc_node_base/Dockerfile index 28bd7b2556..4ca0e53c0a 100644 --- a/tools/dockerfile/grpc_node_base/Dockerfile +++ b/tools/dockerfile/grpc_node_base/Dockerfile @@ -15,8 +15,5 @@ RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive -# Build the C core -RUN make static_c shared_c -j12 -C /var/local/git/grpc - # Define the default command. CMD ["bash"]
\ No newline at end of file diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile index 47266a310e..900d8abe30 100644 --- a/tools/dockerfile/grpc_php_base/Dockerfile +++ b/tools/dockerfile/grpc_php_base/Dockerfile @@ -88,8 +88,5 @@ RUN wget https://phar.phpunit.de/phpunit.phar \ && chmod +x phpunit.phar \ && mv phpunit.phar /usr/local/bin/phpunit -# Build the C core -RUN make static_c shared_c -j12 -C /var/local/git/grpc - # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/grpc_ruby_base/Dockerfile b/tools/dockerfile/grpc_ruby_base/Dockerfile index ec4544d2fd..787f1290b0 100644 --- a/tools/dockerfile/grpc_ruby_base/Dockerfile +++ b/tools/dockerfile/grpc_ruby_base/Dockerfile @@ -53,6 +53,3 @@ RUN cd /var/local/git/grpc/third_party/protobuf && \ ./autogen.sh && \ ./configure --prefix=/usr && \ make -j12 && make check && make install && make clean - -# Build the C core -RUN make static_c shared_c -j12 -C /var/local/git/grpc |