Skip to content

Commit

Permalink
Upgrade Caddy dependency and Go version
Browse files Browse the repository at this point in the history
  • Loading branch information
pteich committed May 3, 2022
1 parent dddd1e8 commit 71b896f
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 29 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17 AS builder
FROM golang:1.18 AS builder

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


Expand Down
12 changes: 4 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
module github.com/pteich/caddy-tlsconsul

go 1.15
go 1.16

require (
github.com/armon/go-metrics v0.3.10 // indirect
github.com/caddyserver/caddy/v2 v2.5.0-beta.1.0.20220325185629-b4f1a713978f
github.com/caddyserver/certmagic v0.16.0
github.com/caddyserver/caddy/v2 v2.5.0
github.com/caddyserver/certmagic v0.16.1
github.com/fatih/color v1.13.0 // indirect
github.com/hashicorp/consul/api v1.12.0
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.0.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/miekg/dns v1.1.47 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/pteich/errors v1.0.1
github.com/stretchr/testify v1.7.0
go.uber.org/atomic v1.9.0 // indirect
github.com/stretchr/testify v1.7.1
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect
Expand Down
Loading

0 comments on commit 71b896f

Please sign in to comment.