Merge pull request #350 from murgatroid99/node_dockerfile_fix

Set leaf dockerfiles to clean C library before rebuilding
pull/360/head
Tim Emiola 10 years ago
commit c0728c44bf
  1. 3
      tools/dockerfile/grpc_node_base/Dockerfile
  2. 3
      tools/dockerfile/grpc_php_base/Dockerfile
  3. 3
      tools/dockerfile/grpc_ruby_base/Dockerfile

@ -15,8 +15,5 @@ RUN cd /var/local/git/grpc && \
git pull --recurse-submodules && \ git pull --recurse-submodules && \
git submodule update --init --recursive 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. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -88,8 +88,5 @@ RUN wget https://phar.phpunit.de/phpunit.phar \
&& chmod +x phpunit.phar \ && chmod +x phpunit.phar \
&& mv phpunit.phar /usr/local/bin/phpunit && 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. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -53,6 +53,3 @@ RUN cd /var/local/git/grpc/third_party/protobuf && \
./autogen.sh && \ ./autogen.sh && \
./configure --prefix=/usr && \ ./configure --prefix=/usr && \
make -j12 && make check && make install && make clean make -j12 && make check && make install && make clean
# Build the C core
RUN make static_c shared_c -j12 -C /var/local/git/grpc

Loading…
Cancel
Save