From ea36c97b98c0593d97f4fc6abb702ab34a17040b Mon Sep 17 00:00:00 2001 From: murgatroid99 <michael.lumish@gmail.com> Date: Mon, 2 Feb 2015 14:51:15 -0800 Subject: [PATCH] Removed redundant call to make in grpc_*_base Dockerfiles --- tools/dockerfile/grpc_node/Dockerfile | 1 - tools/dockerfile/grpc_node_base/Dockerfile | 3 --- tools/dockerfile/grpc_php/Dockerfile | 1 - tools/dockerfile/grpc_php_base/Dockerfile | 3 --- tools/dockerfile/grpc_ruby/Dockerfile | 1 - tools/dockerfile/grpc_ruby_base/Dockerfile | 3 --- 6 files changed, 12 deletions(-) diff --git a/tools/dockerfile/grpc_node/Dockerfile b/tools/dockerfile/grpc_node/Dockerfile index 61d726338c..baec0e21d8 100644 --- a/tools/dockerfile/grpc_node/Dockerfile +++ b/tools/dockerfile/grpc_node/Dockerfile @@ -7,7 +7,6 @@ RUN cd /var/local/git/grpc \ && git submodule update --init --recursive # Install the C core. -RUN make clean -C /var/local/git/grpc RUN make install_c -C /var/local/git/grpc RUN cd /var/local/git/grpc/src/node && npm install && node-gyp rebuild 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/Dockerfile b/tools/dockerfile/grpc_php/Dockerfile index 00285ee840..177587669c 100644 --- a/tools/dockerfile/grpc_php/Dockerfile +++ b/tools/dockerfile/grpc_php/Dockerfile @@ -5,7 +5,6 @@ RUN cd /var/local/git/grpc \ && git pull --recurse-submodules \ && git submodule update --init --recursive -RUN make clean -C /var/local/git/grpc RUN make install_c -j12 -C /var/local/git/grpc RUN cd /var/local/git/grpc/src/php/ext/grpc && git pull && phpize 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/Dockerfile b/tools/dockerfile/grpc_ruby/Dockerfile index 3213b288db..c84548c880 100644 --- a/tools/dockerfile/grpc_ruby/Dockerfile +++ b/tools/dockerfile/grpc_ruby/Dockerfile @@ -10,7 +10,6 @@ RUN cd /var/local/git/grpc \ RUN touch /var/local/git/grpc/include/grpc/support/string.h # Build the C core. -RUN make clean -C /var/local/git/grpc RUN make install_c -C /var/local/git/grpc # Build ruby gRPC and run its tests 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 -- GitLab