Skip to content

Commit 7c0c619

Browse files
committed
Update to Go 1.15
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
1 parent 0f419a7 commit 7c0c619

File tree

9 files changed

+47
-20
lines changed

9 files changed

+47
-20
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM openfaas/classic-watchdog:0.18.10 as watchdog
1+
FROM ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
22

3-
FROM golang:1.13-alpine as build
3+
FROM golang:1.15-alpine as build
44

55
ENV CGO_ENABLED=0
66
ENV GO111MODULE=on

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/alexellis/derek
22

3-
go 1.13
3+
go 1.15
44

55
require (
66
github.com/alexellis/hmac v0.0.0-20180624211220-5c52ab81c0de
@@ -9,6 +9,6 @@ require (
99
github.com/google/go-querystring v1.0.0 // indirect
1010
github.com/imdario/mergo v0.3.11
1111
github.com/sirupsen/logrus v1.7.0
12-
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
13-
gopkg.in/yaml.v2 v2.3.0
12+
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
13+
gopkg.in/yaml.v2 v2.4.0
1414
)

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
202202
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
203203
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
204204
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
205-
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc=
206-
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
205+
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 h1:Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4=
206+
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
207207
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
208208
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
209209
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -374,6 +374,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
374374
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
375375
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
376376
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
377+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
378+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
377379
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
378380
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
379381
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

vendor/golang.org/x/oauth2/README.md

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v2/.travis.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v2/apic.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v2/go.mod

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v2/yaml.go

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
# github.com/alexellis/hmac v0.0.0-20180624211220-5c52ab81c0de
2+
## explicit
23
github.com/alexellis/hmac
34
# github.com/dgrijalva/jwt-go v3.2.0+incompatible
5+
## explicit
46
github.com/dgrijalva/jwt-go
57
# github.com/golang/protobuf v1.4.2
68
github.com/golang/protobuf/proto
79
# github.com/google/go-github v17.0.0+incompatible
10+
## explicit
811
github.com/google/go-github/github
912
# github.com/google/go-querystring v1.0.0
13+
## explicit
1014
github.com/google/go-querystring/query
1115
# github.com/imdario/mergo v0.3.11
16+
## explicit
1217
github.com/imdario/mergo
1318
# github.com/sirupsen/logrus v1.7.0
19+
## explicit
1420
github.com/sirupsen/logrus
1521
# golang.org/x/net v0.0.0-20200822124328-c89045814202
1622
golang.org/x/net/context
1723
golang.org/x/net/context/ctxhttp
18-
# golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
24+
# golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
25+
## explicit
1926
golang.org/x/oauth2
2027
golang.org/x/oauth2/internal
2128
# golang.org/x/sys v0.0.0-20200803210538-64077c9b5642
@@ -57,5 +64,6 @@ google.golang.org/protobuf/reflect/protoreflect
5764
google.golang.org/protobuf/reflect/protoregistry
5865
google.golang.org/protobuf/runtime/protoiface
5966
google.golang.org/protobuf/runtime/protoimpl
60-
# gopkg.in/yaml.v2 v2.3.0
67+
# gopkg.in/yaml.v2 v2.4.0
68+
## explicit
6169
gopkg.in/yaml.v2

0 commit comments

Comments
 (0)