Skip to content

Commit fe70a99

Browse files
author
Nicholas Tillmann
committed
Update Go to 1.22.0, Update golang/net to v0.21.0, Update Alpine to v3.19
Signed-off-by: Nicholas Tillmann <[email protected]>
1 parent d1c5be6 commit fe70a99

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Builder phase, includes golang toolchain
2-
FROM golang:1.20.11-alpine3.18 as builder
2+
FROM golang:1.22.0-alpine3.19 as builder
33
COPY . /src
44
WORKDIR /src
55
RUN go build -o mq2prom ./cmd
66

77
# Runtime phase, contains bare alpine plus the built binary and the config file
88
# IMPORTANT: keep the alpine version on the builder and the runtime base images aligned
9-
FROM alpine:3.18
9+
FROM alpine:3.19
1010
RUN mkdir /mq2prom
1111
WORKDIR /mq2prom
1212
COPY --from=builder /src/mq2prom /src/config.yaml .

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ require (
2323
github.com/prometheus/common v0.42.0 // indirect
2424
github.com/prometheus/procfs v0.10.1 // indirect
2525
github.com/rogpeppe/go-internal v1.11.0 // indirect
26-
golang.org/x/net v0.8.0 // indirect
26+
golang.org/x/net v0.21.0 // indirect
2727
golang.org/x/sync v0.2.0 // indirect
28-
golang.org/x/sys v0.8.0 // indirect
28+
golang.org/x/sys v0.17.0 // indirect
2929
google.golang.org/protobuf v1.30.0 // indirect
3030
)

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
4040
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
4141
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
4242
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
43-
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
44-
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
43+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
44+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
4545
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4646
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
4747
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4848
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49-
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
50-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
50+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5151
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5252
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
5353
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

0 commit comments

Comments
 (0)