github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1296 from weaveworks/go1.6.1

Browse Source 
Update to go 1.6.1
This commit is contained in:
Tom Wilkie
2016-04-19 12:59:33 +01:00
parent 1d4ea3e0dc 8f03b67ade
commit edef3551d3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -29,7 +29,7 @@ GO_HOST=$(NO_CROSS_COMP); $(GO)
WITH_GO_HOST_ENV=$(NO_CROSS_COMP); $(GO_ENV)
GO_BUILD_INSTALL_DEPS=-i
GO_BUILD_TAGS='netgo unsafe'
GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags $(GO_BUILD_TAGS)
GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION) -s -w" -tags $(GO_BUILD_TAGS)
all: $(SCOPE_EXPORT)

2
backend/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM golang:1.6.0
FROM golang:1.6.1
RUN apt-get update && \
apt-get install -y libpcap-dev python-requests time file && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*