From a134d6552287c7f4cdfbdeb7fa1ea37b909bdd7e Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Tue, 6 Nov 2018 12:23:26 -0800 Subject: [PATCH] Update go version to 1.11.2 for gobgp and telemetry Signed-off-by: Jipan Yang --- sonic-slave/Dockerfile | 2 +- src/gobgp/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index 76ec1781d526..fe018eb941db 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -250,7 +250,7 @@ RUN apt-get update && apt-get install -y \ RUN apt-get -y build-dep linux # For gobgp build -RUN export VERSION=1.8.3 \ +RUN export VERSION=1.11.2 \ && wget https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz \ && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \ && echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \ diff --git a/src/gobgp/Makefile b/src/gobgp/Makefile index ec0bdc74f034..4fda21013afb 100644 --- a/src/gobgp/Makefile +++ b/src/gobgp/Makefile @@ -5,10 +5,10 @@ INSTALL := /usr/bin/install all: gobgp gobgpd gobgpd: - go get -v github.com/osrg/gobgp/gobgpd + /usr/local/go/bin/go get -v github.com/osrg/gobgp/cmd/gobgpd gobgp: - go get -v github.com/osrg/gobgp/gobgp + /usr/local/go/bin/go get -v github.com/osrg/gobgp/cmd/gobgp install: $(INSTALL) -D ${GOPATH}/bin/gobgp $(DESTDIR)/usr/bin/gobgp