From 2f02bb051f0c1b907b39763f6bcae0ced9571c91 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org> Date: Sat, 28 Feb 2015 05:58:22 +0100 Subject: [PATCH] Further cleanup. --- tools/dockerfile/grpc_build_deb/Dockerfile | 2 +- tools/dockerfile/grpc_cxx/Dockerfile | 2 +- tools/dockerfile/grpc_go/Dockerfile | 15 --------------- tools/dockerfile/grpc_java/Dockerfile | 2 +- tools/dockerfile/grpc_java_base/Dockerfile | 8 +------- tools/dockerfile/grpc_node_base/Dockerfile | 2 +- tools/dockerfile/grpc_php_base/Dockerfile | 4 ++-- tools/dockerfile/grpc_python_base/Dockerfile | 2 +- tools/dockerfile/grpc_ruby_base/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 30 deletions(-) diff --git a/tools/dockerfile/grpc_build_deb/Dockerfile b/tools/dockerfile/grpc_build_deb/Dockerfile index 6cba74e4c6..24ffc7379c 100644 --- a/tools/dockerfile/grpc_build_deb/Dockerfile +++ b/tools/dockerfile/grpc_build_deb/Dockerfile @@ -34,7 +34,7 @@ FROM grpc/base RUN apt-get update && apt-get install -y lintian # Get the source from GitHub -RUN git clone git@github.com:grpc/grpc.git /var/local/git/grpc +RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive diff --git a/tools/dockerfile/grpc_cxx/Dockerfile b/tools/dockerfile/grpc_cxx/Dockerfile index 18c6732496..ac09e25e40 100644 --- a/tools/dockerfile/grpc_cxx/Dockerfile +++ b/tools/dockerfile/grpc_cxx/Dockerfile @@ -33,7 +33,7 @@ FROM grpc/base RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev # Get the source from GitHub -RUN git clone git@github.com:grpc/grpc.git /var/local/git/grpc +RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive diff --git a/tools/dockerfile/grpc_go/Dockerfile b/tools/dockerfile/grpc_go/Dockerfile index e1671eaee1..06bb3e2d5e 100644 --- a/tools/dockerfile/grpc_go/Dockerfile +++ b/tools/dockerfile/grpc_go/Dockerfile @@ -30,21 +30,6 @@ # Dockerfile for gRPC Go FROM golang:1.4 -# Install SSH to that Go source can be pulled securely. -RUN apt-get update && apt-get install -y ssh - -# Install a GitHub SSH service credential that gives access to the GitHub repo while it's private -# -# TODO: remove this once the repo is public -ADD .ssh .ssh -RUN chmod 600 /.ssh/github.rsa -RUN mkdir -p $HOME/.ssh && echo 'Host github.com' > $HOME/.ssh/config -RUN echo " IdentityFile /.ssh/github.rsa" >> $HOME/.ssh/config -RUN echo 'StrictHostKeyChecking no' >> $HOME/.ssh/config - -# Force go get to use the GitHub ssh url instead of https, and use the SSH creds -RUN git config --global url."git@github.com:".insteadOf "https://github.com/" - # Get the source from GitHub RUN go get google.golang.org/grpc diff --git a/tools/dockerfile/grpc_java/Dockerfile b/tools/dockerfile/grpc_java/Dockerfile index affbec9b20..6b2612b9b2 100644 --- a/tools/dockerfile/grpc_java/Dockerfile +++ b/tools/dockerfile/grpc_java/Dockerfile @@ -30,7 +30,7 @@ # Dockerfile for the gRPC Java dev image FROM grpc/java_base -RUN git clone --recursive --depth 1 git@github.com:grpc/grpc-java.git /var/local/git/grpc-java +RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git /var/local/git/grpc-java RUN cd /var/local/git/grpc-java/lib/netty && \ mvn -pl codec-http2 -am -DskipTests install clean RUN cd /var/local/git/grpc-java && \ diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile index 3eebc2bb93..2ee0a623c7 100644 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ b/tools/dockerfile/grpc_java_base/Dockerfile @@ -61,15 +61,9 @@ RUN wget -O - https://github.com/google/protobuf/archive/v3.0.0-alpha-2.tar.gz | cd javanano && mvn install && cd .. && \ rm -r "$(pwd)" -# Install a GitHub SSH service credential that gives access to the GitHub repo while it's private -# TODO: remove this once the repo is public -COPY .ssh/github.rsa /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -RUN echo 'Host github.com\nStrictHostKeyChecking no' > /root/.ssh/config - # Trigger download of as many Maven and Gradle artifacts as possible. We don't build grpc-java # because we don't want to install netty -RUN git clone --recursive --depth 1 git@github.com:grpc/grpc-java.git && \ +RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && \ cd grpc-java/lib/netty && \ mvn -pl codec-http2 -am -DskipTests verify && \ cd ../.. && \ diff --git a/tools/dockerfile/grpc_node_base/Dockerfile b/tools/dockerfile/grpc_node_base/Dockerfile index 20ed4cf7be..1f3a2362e9 100644 --- a/tools/dockerfile/grpc_node_base/Dockerfile +++ b/tools/dockerfile/grpc_node_base/Dockerfile @@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y nodejs nodejs-legacy RUN npm install -g node-gyp # Get the source from GitHub, this gets the protobuf library as well -RUN git clone git@github.com:grpc/grpc.git /var/local/git/grpc +RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile index 49f5da846d..cc874fd7c5 100644 --- a/tools/dockerfile/grpc_php_base/Dockerfile +++ b/tools/dockerfile/grpc_php_base/Dockerfile @@ -76,7 +76,7 @@ RUN cd /var/local \ # Download the patched PHP protobuf so that PHP gRPC clients can be generated # from proto3 schemas. -RUN git clone git@github.com:murgatroid99/Protobuf-PHP.git /var/local/git/protobuf-php +RUN git clone https://github.com/murgatroid99/Protobuf-PHP.git /var/local/git/protobuf-php # Install ruby (via RVM) as ruby tools are dependencies for building Protobuf # PHP extensions. @@ -91,7 +91,7 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s 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:grpc/grpc.git /var/local/git/grpc +RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive diff --git a/tools/dockerfile/grpc_python_base/Dockerfile b/tools/dockerfile/grpc_python_base/Dockerfile index 18dd40a05a..0d45f40242 100644 --- a/tools/dockerfile/grpc_python_base/Dockerfile +++ b/tools/dockerfile/grpc_python_base/Dockerfile @@ -46,4 +46,4 @@ RUN apt-get update && apt-get install -y \ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0-alpha-1 # Get the GRPC source from GitHub -RUN git clone --recursive git@github.com:grpc/grpc.git /var/local/git/grpc +RUN git clone --recursive https://github.com/grpc/grpc.git /var/local/git/grpc diff --git a/tools/dockerfile/grpc_ruby_base/Dockerfile b/tools/dockerfile/grpc_ruby_base/Dockerfile index f3c7289943..d58eeaaf70 100644 --- a/tools/dockerfile/grpc_ruby_base/Dockerfile +++ b/tools/dockerfile/grpc_ruby_base/Dockerfile @@ -72,7 +72,7 @@ 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" # Get the source from GitHub -RUN git clone git@github.com:grpc/grpc.git /var/local/git/grpc +RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ git pull --recurse-submodules && \ git submodule update --init --recursive -- GitLab