4731122 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Merge pull request #17 from syscll/feature/go-1.11

build: use go 1.11

commit473112216f7ee02e5b22a5691b7bff10bb124eb2 authorJoel Speed <Joel.speed@hotmail.co.uk> dateWed 16 Jan 2019, 12:28 (8 years ago) parent7887272 f35efd1

3 files changed+8−6

compare with master

unifiedsplit

.travis.yml+2−2 Dockerfile+4−2 configure+2−2

.travis.yml+2−2

@@ -1,10 +1,10 @@

11language: go

22go:

3− - 1.9.x

43 - 1.10.x

4+ - 1.11.x

55install:

66 # Fetch dependencies

7− - wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64

7+ - wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64

88 - chmod +x dep

99 - mv dep $GOPATH/bin/dep

1010script:

Dockerfile+4−2

@@ -1,9 +1,11 @@

1−FROM golang:1.10 AS builder

1+FROM golang:1.11-stretch AS builder

22WORKDIR /go/src/github.com/pusher/oauth2_proxy

33COPY . .

55# Fetch dependencies

6−RUN go get -u github.com/golang/dep/cmd/dep

6+RUN wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64

7+RUN chmod +x dep

8+RUN mv dep $GOPATH/bin/dep

79RUN dep ensure --vendor-only

810

911# Build image

configure+2−2

@@ -81,7 +81,7 @@ check_for() {

8181check_go_version() {

8282 echo -n "Checking go version... "

8383 GO_VERSION=$(${tools[go]} version | ${tools[awk]} '{where = match($0, /[0-9]\.[0-9]+\.[0-9]*/); if (where != 0) print substr($0, RSTART, RLENGTH)}')

84− vercomp $GO_VERSION 1.9

84+ vercomp $GO_VERSION 1.10

8585 case $? in

8686 0) ;&

8787 1)

@@ -91,7 +91,7 @@ check_go_version() {

9191 ;;

9292 2)

9393 printf "${RED}"

94− echo "$GO_VERSION < 1.9"

94+ echo "$GO_VERSION < 1.10"

9595 exit 1

9696 ;;

9797 esac