Skip to content

Commit

Permalink
remove the GO15VENDOREXPERIMENT environment variable
Browse files Browse the repository at this point in the history
Go 1.7 removed support for the variable: https://golang.org/doc/go1.7
Since teleport requires 1.7 or higher, the variable is redundant.
  • Loading branch information
0xmohit committed Sep 29, 2016
1 parent 3130f18 commit 266fce2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ BINDIR ?= /usr/local/bin
DATADIR ?= /usr/local/share/teleport
ADDFLAGS ?=

GO15VENDOREXPERIMENT := 1
PWD ?= $(shell pwd)
ETCD_CERTS := $(realpath fixtures/certs)
ETCD_FLAGS := TELEPORT_TEST_ETCD_CONFIG='{"nodes": ["https://localhost:4001"], "key":"/teleport/test", "tls_key_file": "$(ETCD_CERTS)/proxy1-key.pem", "tls_cert_file": "$(ETCD_CERTS)/proxy1.pem", "tls_ca_file": "$(ETCD_CERTS)/ca.pem"}'
Expand Down
3 changes: 1 addition & 2 deletions build.assets/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ ENV LANGUAGE="en_US.UTF-8" \
LC_CTYPE="en_US.UTF-8" \
GOPATH="/gopath" \
GOROOT="/opt/go" \
PATH="$PATH:/opt/go/bin:/gopath/bin" \
GO15VENDOREXPERIMENT="1"
PATH="$PATH:/opt/go/bin:/gopath/bin"

VOLUME ["/gopath/src/github.com/gravitational/teleport"]
EXPOSE 6600
1 change: 0 additions & 1 deletion build.assets/release/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ BUILDFLAGS ?= %BUILDFLAGS%
BINDIR ?= /usr/local/bin
DATADIR ?= /usr/local/share/teleport
PKGPATH := github.com/gravitational/teleport
GO15VENDOREXPERIMENT := 1
export

#
Expand Down

0 comments on commit 266fce2

Please sign in to comment.