Skip to content

Commit

Permalink
Merge pull request #3195 from getlantern/issue-3194
Browse files Browse the repository at this point in the history
Go version bump (security fix) -> 1.4.3
  • Loading branch information
myleshorton committed Oct 9, 2015
2 parents a611575 + 199ff6c commit 151a104
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.4.2
- 1.4.3
install:
- sudo apt-get install make libgtk-3-dev libappindicator3-dev -y
- go get golang.org/x/tools/cmd/cover
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
FROM fedora:21
MAINTAINER "José Carlos Nieto" <xiam@getlantern.org>

ENV GO_VERSION go1.4.2
ENV GO_VERSION go1.4.3
ENV GOROOT_BOOTSTRAP /go1.4
ENV GOROOT /go
ENV GOPATH /
Expand All @@ -15,7 +15,7 @@ ENV PATH $PATH:$GOROOT/bin
ENV WORKDIR /lantern

# Go binary for bootstrapping.
ENV GO_PACKAGE_URL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
ENV GO_PACKAGE_URL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz

# Updating system.
RUN yum -y update && yum clean all
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BUILD_DATE := $(shell date -u +%Y%m%d.%H%M%S)

LOGGLY_TOKEN := 2b68163b-89b6-4196-b878-c1aca4bbdf84

LDFLAGS := -w -X main.version $(GIT_REVISION) -X main.revisionDate $(REVISION_DATE) -X main.buildDate $(BUILD_DATE) -X github.com/getlantern/flashlight/logging.logglyToken \"$(LOGGLY_TOKEN)\"
LDFLAGS := -w -X=main.version=$(GIT_REVISION) -X=main.revisionDate=$(REVISION_DATE) -X=main.buildDate=$(BUILD_DATE) -X=github.com/getlantern/flashlight/logging.logglyToken=$(LOGGLY_TOKEN)
LANTERN_DESCRIPTION := Censorship circumvention tool
LANTERN_EXTENDED_DESCRIPTION := Lantern allows you to access sites blocked by internet censorship.\nWhen you run it, Lantern reroutes traffic to selected domains through servers located where such domains are uncensored.

Expand Down
2 changes: 1 addition & 1 deletion src/github.com/getlantern/lantern-mobile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM fedora:22
MAINTAINER "Ulysses Aalto" <uaalto@getlantern.org>

ENV GO_VERSION go1.4.2
ENV GO_VERSION go1.4.3
ENV GOROOT_BOOTSTRAP /go1.4
ENV GOROOT /go
ENV GOPATH /
Expand Down

0 comments on commit 151a104

Please sign in to comment.