From ac0f020ddc530f98ca94141cd204868bb1275304 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 21 Apr 2016 07:11:52 -0700 Subject: [PATCH 1/2] upgrade go docker image to golang:1.5 --- templates/tools/dockerfile/go_path.include | 2 +- .../stress_test/grpc_interop_stress_go/Dockerfile.template | 2 +- tools/dockerfile/grpc_interop_go/Dockerfile | 4 ++-- .../dockerfile/stress_test/grpc_interop_stress_go/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/tools/dockerfile/go_path.include b/templates/tools/dockerfile/go_path.include index d61b6f6984c..a41cc49d380 100644 --- a/templates/tools/dockerfile/go_path.include +++ b/templates/tools/dockerfile/go_path.include @@ -1,2 +1,2 @@ # Using login shell removes Go from path, so we add it. -RUN ln -s /usr/src/go/bin/go /usr/local/bin +RUN ln -s /usr/local/go/bin/go /usr/local/bin diff --git a/templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template b/templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template index 20e4d825cad..3ed3d6556f9 100644 --- a/templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template +++ b/templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - FROM golang:1.4 + FROM golang:1.5 <%include file="../../gcp_api_libraries.include"/> <%include file="../../go_path.include"/> diff --git a/tools/dockerfile/grpc_interop_go/Dockerfile b/tools/dockerfile/grpc_interop_go/Dockerfile index bb60f09f247..ec71a53c2d3 100644 --- a/tools/dockerfile/grpc_interop_go/Dockerfile +++ b/tools/dockerfile/grpc_interop_go/Dockerfile @@ -27,10 +27,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM golang:1.4 +FROM golang:1.5 # Using login shell removes Go from path, so we add it. -RUN ln -s /usr/src/go/bin/go /usr/local/bin +RUN ln -s /usr/local/go/bin/go /usr/local/bin # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile b/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile index feda3fc9bcf..2a875f59f19 100644 --- a/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile +++ b/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM golang:1.4 +FROM golang:1.5 # Google Cloud platform API libraries RUN apt-get update && apt-get install -y python-pip && apt-get clean @@ -35,7 +35,7 @@ RUN pip install --upgrade google-api-python-client # Using login shell removes Go from path, so we add it. -RUN ln -s /usr/src/go/bin/go /usr/local/bin +RUN ln -s /usr/local/go/bin/go /usr/local/bin # Define the default command. CMD ["bash"] From 549da44e80547401c1dbdb312a42a37f04be14b4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 21 Apr 2016 07:23:00 -0700 Subject: [PATCH 2/2] also update interop_http2 image --- tools/dockerfile/grpc_interop_http2/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dockerfile/grpc_interop_http2/Dockerfile b/tools/dockerfile/grpc_interop_http2/Dockerfile index bb60f09f247..ec71a53c2d3 100644 --- a/tools/dockerfile/grpc_interop_http2/Dockerfile +++ b/tools/dockerfile/grpc_interop_http2/Dockerfile @@ -27,10 +27,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM golang:1.4 +FROM golang:1.5 # Using login shell removes Go from path, so we add it. -RUN ln -s /usr/src/go/bin/go /usr/local/bin +RUN ln -s /usr/local/go/bin/go /usr/local/bin # Define the default command. CMD ["bash"]