Skip to content

Commit ea436c7

Browse files
committed
Bump min. go version to 1.18, 1.17 is EOL
Use go version 1.19 as base image Bump consul version to 1.13.3 Update go.mod dependencies
1 parent 5038214 commit ea436c7

3 files changed

Lines changed: 62 additions & 47 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM golang:1.18
1+
FROM golang:1.19
22

3-
ENV CONSUL_VERSION=1.11.4
3+
ENV CONSUL_VERSION=1.13.3
44

55
RUN apt-get update \
66
&& apt-get install -y unzip \
77
&& go install honnef.co/go/tools/cmd/staticcheck@latest
88

99

10-
RUN export CONSUL_CHECKSUM=5155f6a3b7ff14d3671b0516f6b7310530b509a2b882b95b4fdf25f4219342c8 \
10+
RUN export CONSUL_CHECKSUM=5370b0b5bf765530e28cb80f90dcb47bd7d6ba78176c1ab2430f56e460ed279c \
1111
&& export archive=consul_${CONSUL_VERSION}_linux_amd64.zip \
1212
&& curl -Lso /tmp/${archive} https://releases.hashicorp.com/consul/${CONSUL_VERSION}/${archive} \
1313
&& echo "${CONSUL_CHECKSUM} /tmp/${archive}" | sha256sum -c \

go.mod

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/joyent/containerpilot
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/client9/reopen v1.0.0
77
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
8-
github.com/hashicorp/consul/api v1.12.0
9-
github.com/hashicorp/consul/sdk v0.9.0
8+
github.com/hashicorp/consul/api v1.15.3
9+
github.com/hashicorp/consul/sdk v0.11.0
1010
github.com/hashicorp/go-cleanhttp v0.5.2
11-
github.com/mitchellh/mapstructure v1.4.3
12-
github.com/prometheus/client_golang v1.12.1
13-
github.com/sirupsen/logrus v1.8.1
14-
github.com/stretchr/testify v1.7.0
11+
github.com/mitchellh/mapstructure v1.5.0
12+
github.com/prometheus/client_golang v1.13.0
13+
github.com/sirupsen/logrus v1.9.0
14+
github.com/stretchr/testify v1.8.1
1515
)
1616

1717
require (
@@ -23,9 +23,7 @@ require (
2323
github.com/golang/protobuf v1.5.2 // indirect
2424
github.com/hashicorp/go-hclog v1.2.0 // indirect
2525
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
26-
github.com/hashicorp/go-msgpack v0.5.5 // indirect
2726
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
28-
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
2927
github.com/hashicorp/golang-lru v0.5.4 // indirect
3028
github.com/hashicorp/serf v0.9.7 // indirect
3129
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -35,10 +33,10 @@ require (
3533
github.com/mitchellh/go-homedir v1.1.0 // indirect
3634
github.com/pmezard/go-difflib v1.0.0 // indirect
3735
github.com/prometheus/client_model v0.2.0 // indirect
38-
github.com/prometheus/common v0.33.0 // indirect
39-
github.com/prometheus/procfs v0.7.3 // indirect
36+
github.com/prometheus/common v0.37.0 // indirect
37+
github.com/prometheus/procfs v0.8.0 // indirect
4038
github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f // indirect
41-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
42-
google.golang.org/protobuf v1.28.0 // indirect
43-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
39+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
40+
google.golang.org/protobuf v1.28.1 // indirect
41+
gopkg.in/yaml.v3 v3.0.1 // indirect
4442
)

0 commit comments

Comments
 (0)