From 1829e4cf42f6352667ad1bfc17a21cf85ea65f52 Mon Sep 17 00:00:00 2001 From: Donna Dionne <donnadionne@google.com> Date: Thu, 12 Feb 2015 17:42:50 -0800 Subject: [PATCH] Fixing go docker file to use the correct golang path Fixing java_base to edit permission on a key file --- tools/dockerfile/grpc_go/Dockerfile | 8 ++++---- tools/dockerfile/grpc_java_base/Dockerfile | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/dockerfile/grpc_go/Dockerfile b/tools/dockerfile/grpc_go/Dockerfile index 1b998152a7..42620ff3cf 100644 --- a/tools/dockerfile/grpc_go/Dockerfile +++ b/tools/dockerfile/grpc_go/Dockerfile @@ -17,11 +17,11 @@ RUN echo 'StrictHostKeyChecking no' >> $HOME/.ssh/config RUN git config --global url."git@github.com:".insteadOf "https://github.com/" # Get the source from GitHub -RUN go get github.com/google/grpc-go/rpc +RUN go get google.golang.org/grpc # Build the interop client and server -RUN cd src/github.com/google/grpc-go/rpc/interop/client && go install -RUN cd src/github.com/google/grpc-go/rpc/interop/server && go install +RUN cd src/google.golang.org/grpc/interop/client && go install +RUN cd src/google.golang.org/grpc/interop/server && go install # Specify the default command such that the interop server runs on its known testing port -CMD ["/bin/bash", "-c", "cd src/github.com/google/grpc-go/rpc/interop/server && go run server.go --use_tls=true --port=8020"] +CMD ["/bin/bash", "-c", "cd src/google.golang.org/grpc/interop/server && go run server.go --use_tls=true --port=8020"] diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile index 129b8130ef..6031be484a 100644 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ b/tools/dockerfile/grpc_java_base/Dockerfile @@ -34,6 +34,7 @@ RUN wget -O - https://github.com/google/protobuf/archive/master.tar.gz | \ # 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 -- GitLab