aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-04-21 07:11:52 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-04-21 07:11:52 -0700
commitac0f020ddc530f98ca94141cd204868bb1275304 (patch)
tree4102754cf292fdaa1f93a9a6dc2b38a747b1e85c /templates/tools
parentdde6dfbb0bd1dfb3deac0b4f703d63528e1dc798 (diff)
upgrade go docker image to golang:1.5
Diffstat (limited to 'templates/tools')
-rw-r--r--templates/tools/dockerfile/go_path.include2
-rw-r--r--templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/go_path.include b/templates/tools/dockerfile/go_path.include
index d61b6f6984..a41cc49d38 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 20e4d825ca..3ed3d6556f 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"/>