aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2018-02-21 07:15:57 +0000
committerGravatar GitHub <noreply@github.com> 2018-02-21 07:15:57 +0000
commit22409290d9ded3b726ad9d8d2534700fc96e2522 (patch)
tree1b7da74df2f2d15470eb04de26e887da450b5a5c
parent86be6d2532693dd4b900548fdc5e4820bf0bec9f (diff)
downloadcoredns-22409290d9ded3b726ad9d8d2534700fc96e2522.tar.gz
coredns-22409290d9ded3b726ad9d8d2534700fc96e2522.tar.zst
coredns-22409290d9ded3b726ad9d8d2534700fc96e2522.zip
Caddy 0.10.11 Fix (#1544)
Caddy 0.10.11 is released. Fix CoreDNS to compile against that version. This also helps people compiling CoreDNS and go getting non-vendored deps.
-rw-r--r--Makefile2
-rw-r--r--core/dnsserver/register.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 020abdc80..3b4857c86 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ godeps:
go get -u github.com/prometheus/client_golang/prometheus
go get -u golang.org/x/net/context
go get -u golang.org/x/text
- (cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.10.10)
+ (cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.10.11)
(cd $(GOPATH)/src/github.com/miekg/dns && git checkout -q v1.0.4)
(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0)
(cd $(GOPATH)/src/golang.org/x/net && git checkout -q release-branch.go1.9)
diff --git a/core/dnsserver/register.go b/core/dnsserver/register.go
index 058ed1079..8be36cd22 100644
--- a/core/dnsserver/register.go
+++ b/core/dnsserver/register.go
@@ -34,7 +34,7 @@ func init() {
})
}
-func newContext() caddy.Context {
+func newContext(i *caddy.Instance) caddy.Context {
return &dnsContext{keysToConfigs: make(map[string]*Config)}
}