Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update go version to 1.11.2 for gobgp and telemetry #2230

Merged
merged 1 commit into from
Nov 10, 2018
Merged

Update go version to 1.11.2 for gobgp and telemetry #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sonic-slave/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason not using 1.11.2?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No specific concrete reason. 1.11.1 is recent enough. could change it to 1.11.2 which was release a few days ago.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw you upgraded to 1.11.2, since 1.11.2 is mostly backport bug fixes comparing to 1.11.1, this should be a good move.

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 \
Expand Down
4 changes: 2 additions & 2 deletions src/gobgp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the go path is not set with the new 1.11 version?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you log into slave docker, go is there. Somehow, it didn't work with the makefile.


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
Expand Down