Skip to content
Snippets Groups Projects
Commit d2130c35 authored by Tim Emiola's avatar Tim Emiola
Browse files

Switches the grpc-repo dockerfiles to pull gRPC source from GitHub

parent a36b84ca
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
tools/dockerfile/grpc_base/Dockerfile
+ 8
− 17
View file @ d2130c35
...@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \ ...@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \
libc6 \ libc6 \
libc6-dbg \ libc6-dbg \
libc6-dev \ libc6-dev \
libgtest-dev \
libtool \ libtool \
make \ make \
strace \ strace \
...@@ -34,23 +35,13 @@ ENV CLOUD_SDK /google-cloud-sdk ...@@ -34,23 +35,13 @@ ENV CLOUD_SDK /google-cloud-sdk
RUN $CLOUD_SDK/install.sh --usage-reporting=true --path-update=true --bash-completion=true --rc-path=/.bashrc --disable-installation-options RUN $CLOUD_SDK/install.sh --usage-reporting=true --path-update=true --bash-completion=true --rc-path=/.bashrc --disable-installation-options
ENV PATH $CLOUD_SDK/bin:$PATH ENV PATH $CLOUD_SDK/bin:$PATH
# Install gcompute-tools to allow access to private git-on-borg repos # Install a GitHub SSH service credential that gives access to the GitHub repo while it's private
RUN git clone https://gerrit.googlesource.com/gcompute-tools /var/local/git/gcompute-tools # TODO: remove this once the repo is public
ADD .ssh .ssh
# Start the daemon that allows access to private git-on-borg repos RUN chmod 600 .ssh/github.rsa
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon RUN mkdir -p $HOME/.ssh && echo 'Host github.com' > $HOME/.ssh/config
RUN echo " IdentityFile /.ssh/github.rsa" >> $HOME/.ssh/config
# Install the grpc-tools scripts dir from git RUN echo 'StrictHostKeyChecking no' >> $HOME/.ssh/config
RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc-tools /var/local/git/grpc-tools
# Install the grpc-protobuf dir that has the protoc patch
RUN git clone https://team.googlesource.com/one-platform-grpc-team/protobuf /var/local/git/protobuf
# Install the patched version of protoc
RUN cd /var/local/git/protobuf && \
./autogen.sh && \
./configure --prefix=/usr && \
make && make check && make install && make clean
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
tools/dockerfile/grpc_cxx/Dockerfile
+ 11
− 8
View file @ d2130c35
# Dockerfile for gRPC C++ # Dockerfile for gRPC C++
FROM grpc/base FROM grpc/base
# Start the daemon that allows access to the protected git-on-borg repos # Get the source from GitHub
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon RUN git clone git@github.com:google/grpc.git /var/local/git/grpc
RUN cd /var/local/git/grpc && \
RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc /var/local/git/grpc git pull --recurse-submodules && \
RUN cd /var/local/git/grpc \ git submodule update --init --recursive
&& git pull --recurse-submodules \
&& git submodule update --init --recursive
# Build the protobuf library; then the C core.
RUN cd /var/local/git/grpc/third_party/protobuf && \
./autogen.sh && \
./configure --prefix=/usr && \
make -j12 && make check && make install && make clean
RUN make install -C /var/local/git/grpc RUN make install -C /var/local/git/grpc
# Define the default command. # Define the default command.
......
tools/dockerfile/grpc_php/Dockerfile
+ 1
− 4
View file @ d2130c35
# Dockerfile for gRPC PHP # Dockerfile for gRPC PHP
FROM grpc/php_base FROM grpc/php_base
# Start the daemon that allows access to the protected git-on-borg repos
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon
RUN cd /var/local/git/grpc \ RUN cd /var/local/git/grpc \
&& git pull --recurse-submodules \ && git pull --recurse-submodules \
&& git submodule update --init --recursive && git submodule update --init --recursive
......
tools/dockerfile/grpc_php_base/Dockerfile
+ 15
− 5
View file @ d2130c35
...@@ -43,9 +43,10 @@ RUN cd /var/local \ ...@@ -43,9 +43,10 @@ RUN cd /var/local \
&& tar -xf php-5.5.17.tar.gz \ && tar -xf php-5.5.17.tar.gz \
&& cd php-5.5.17 \ && cd php-5.5.17 \
&& ./configure --with-zlib=/usr --with-libxml-dir=ext/libxml \ && ./configure --with-zlib=/usr --with-libxml-dir=ext/libxml \
&& make && make install && make -j12 && make install
# Start the daemon that allows access to the protected git-on-borg repos # Start the daemon that allows access to the protected git-on-borg repos
RUN git clone https://gerrit.googlesource.com/gcompute-tools /var/local/git/gcompute-tools
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon RUN /var/local/git/gcompute-tools/git-cookie-authdaemon
# Download the patched PHP protobuf so that PHP gRPC clients can be generated # Download the patched PHP protobuf so that PHP gRPC clients can be generated
...@@ -64,6 +65,18 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s ...@@ -64,6 +65,18 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s
# rake: a ruby version of make used to build the PHP Protobuf extension # rake: a ruby version of make used to build the PHP Protobuf extension
RUN rvm all do gem install ronn rake RUN rvm all do gem install ronn rake
# Get the source from GitHub, this gets the protobuf library as well
RUN git clone git@github.com:google/grpc.git /var/local/git/grpc
RUN cd /var/local/git/grpc && \
git pull --recurse-submodules && \
git submodule update --init --recursive
# Build and install the protobuf library
RUN cd /var/local/git/grpc/third_party/protobuf && \
./autogen.sh && \
./configure --prefix=/usr && \
make -j12 && make check && make install && make clean
# Install the patched PHP protobuf so that PHP gRPC clients can be generated # Install the patched PHP protobuf so that PHP gRPC clients can be generated
# from proto3 schemas. # from proto3 schemas.
RUN cd /var/local/git/protobuf-php \ RUN cd /var/local/git/protobuf-php \
...@@ -75,10 +88,7 @@ RUN wget https://phar.phpunit.de/phpunit.phar \ ...@@ -75,10 +88,7 @@ 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
RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc /var/local/git/grpc # Build the C core
RUN cd /var/local/git/grpc \
&& git submodule update --init --recursive
RUN make static_c shared_c -j12 -C /var/local/git/grpc RUN make static_c shared_c -j12 -C /var/local/git/grpc
# Define the default command. # Define the default command.
......
tools/dockerfile/grpc_ruby/Dockerfile
+ 2
− 7
View file @ d2130c35
# Dockerfile for gRPC Ruby # Dockerfile for gRPC Ruby
FROM grpc/ruby_base FROM grpc/ruby_base
# Start the daemon that allows access to the protected git-on-borg repos # Build the C libary
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon
RUN cd /var/local/git/grpc \ 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 install_c -C /var/local/git/grpc RUN make install_c -C /var/local/git/grpc
# Install the grpc gem locally with its dependencies and build the extension.
RUN /bin/bash -l -c 'cd /var/local/git/beefcake && bundle && gem build beefcake.gemspec && gem install beefcake'
RUN /bin/bash -l -c 'cd /var/local/git/grpc/src/ruby && bundle && rake compile:grpc && gem build grpc.gemspec && gem install grpc'
# TODO add a command to run the unittest tests when the bug below is fixed # TODO add a command to run the unittest tests when the bug below is fixed
# - the tests fail due to an error in the C threading library: # - the tests fail due to an error in the C threading library:
# they fail with 'ruby: __pthread_mutex_cond_lock_adjust for unknown reasons' at the end of a testcase # they fail with 'ruby: __pthread_mutex_cond_lock_adjust for unknown reasons' at the end of a testcase
......
tools/dockerfile/grpc_ruby_base/Dockerfile
+ 13
− 13
View file @ d2130c35
...@@ -31,15 +31,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -31,15 +31,6 @@ RUN apt-get update && apt-get install -y \
sqlite3 \ sqlite3 \
zlib1g-dev zlib1g-dev
# Start the daemon that allows access to the protected git-on-borg repos
RUN /var/local/git/gcompute-tools/git-cookie-authdaemon
# Download the patched Ruby protobuf (beefcake) so that Ruby gRPC clients can
# be generated from proto3 schemas.
RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc-ruby-beefcake \
/var/local/git/beefcake
# Install RVM, use this to install ruby # Install RVM, use this to install ruby
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 # Needed for RVM RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 # Needed for RVM
RUN /bin/bash -l -c "curl -L get.rvm.io | bash -s stable" RUN /bin/bash -l -c "curl -L get.rvm.io | bash -s stable"
...@@ -52,8 +43,17 @@ RUN /bin/bash -l -c "echo 'source /home/grpc_ruby/.rvm/scripts/rvm' >> ~/.bashrc ...@@ -52,8 +43,17 @@ RUN /bin/bash -l -c "echo 'source /home/grpc_ruby/.rvm/scripts/rvm' >> ~/.bashrc
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc /var/local/git/grpc # Get the source from GitHub
RUN cd /var/local/git/grpc \ RUN git clone git@github.com:google/grpc.git /var/local/git/grpc
&& git submodule update --init --recursive RUN cd /var/local/git/grpc && \
git pull --recurse-submodules && \
git submodule update --init --recursive
# Build and install the protobuf library
RUN cd /var/local/git/grpc/third_party/protobuf && \
./autogen.sh && \
./configure --prefix=/usr && \
make -j12 && make check && make install && make clean
RUN make static_c shared_c -C /var/local/git/grpc # Build the C core
\ No newline at end of file RUN make static_c shared_c -j12 -C /var/local/git/grpc
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment