Skip to content

Commit 71b896f

Browse files
committed
Upgrade Caddy dependency and Go version
1 parent dddd1e8 commit 71b896f

File tree

3 files changed

+123
-29
lines changed

3 files changed

+123
-29
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17 AS builder
1+
FROM golang:1.18 AS builder
22

33
WORKDIR /workspace
44
RUN echo 'package main\n\
@@ -11,7 +11,7 @@ func main() {\n\
1111
caddycmd.Main()\n\
1212
}' > main.go && \
1313
go env -w GOPROXY="https://goproxy.io,direct" && \
14-
go mod init caddy && go get github.com/caddyserver/caddy/v2@v2.4.6 && go get && \
14+
go mod init caddy && go get github.com/caddyserver/caddy/v2@v2.5.0 && go get && \
1515
CGO_ENABLED=0 go build -trimpath -tags netgo -ldflags '-extldflags "-static" -s -w' -o /usr/bin/caddy
1616

1717

go.mod

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
module github.com/pteich/caddy-tlsconsul
22

3-
go 1.15
3+
go 1.16
44

55
require (
66
github.com/armon/go-metrics v0.3.10 // indirect
7-
github.com/caddyserver/caddy/v2 v2.5.0-beta.1.0.20220325185629-b4f1a713978f
8-
github.com/caddyserver/certmagic v0.16.0
7+
github.com/caddyserver/caddy/v2 v2.5.0
8+
github.com/caddyserver/certmagic v0.16.1
99
github.com/fatih/color v1.13.0 // indirect
1010
github.com/hashicorp/consul/api v1.12.0
11-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
1211
github.com/hashicorp/go-hclog v1.0.0 // indirect
13-
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
14-
github.com/hashicorp/golang-lru v0.5.4 // indirect
1512
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
1613
github.com/mattn/go-colorable v0.1.12 // indirect
1714
github.com/miekg/dns v1.1.47 // indirect
1815
github.com/mitchellh/mapstructure v1.4.3 // indirect
1916
github.com/onsi/ginkgo v1.16.5 // indirect
2017
github.com/pteich/errors v1.0.1
21-
github.com/stretchr/testify v1.7.0
22-
go.uber.org/atomic v1.9.0 // indirect
18+
github.com/stretchr/testify v1.7.1
2319
go.uber.org/multierr v1.8.0 // indirect
2420
go.uber.org/zap v1.21.0
2521
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect

0 commit comments

Comments
 (0)