From 68bdb08ab1b2b7ad3ccc24d1461742bf542dd479 Mon Sep 17 00:00:00 2001 From: Nicholas Tillmann Date: Wed, 21 Feb 2024 13:06:41 -0800 Subject: [PATCH 1/2] Update Go to 1.22.0, Update golang.org/x/net to v0.21.0, Update Alpine to 3.19 Signed-off-by: Nicholas Tillmann --- Dockerfile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index efcdb74..94a925c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # Builder phase, includes golang toolchain -FROM golang:1.20.11-alpine3.18 as builder +FROM golang:1.22.0-alpine3.19 as builder COPY . /src WORKDIR /src RUN go build -o mq2prom ./cmd # Runtime phase, contains bare alpine plus the built binary and the config file # IMPORTANT: keep the alpine version on the builder and the runtime base images aligned -FROM alpine:3.18 +FROM alpine3.19 RUN mkdir /mq2prom WORKDIR /mq2prom COPY --from=builder /src/mq2prom /src/config.yaml . diff --git a/go.mod b/go.mod index a3b782e..a68ddab 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/IBM/mq2prom -go 1.20 +go 1.22 require ( github.com/eclipse/paho.mqtt.golang v1.4.3 @@ -23,8 +23,8 @@ require ( github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - golang.org/x/net v0.8.0 // indirect + golang.org/x/net v0.21.0 // indirect golang.org/x/sync v0.2.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/sys v0.17.0 // indirect google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/go.sum b/go.sum index 6513d6a..b538171 100644 --- a/go.sum +++ b/go.sum @@ -40,14 +40,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= From e0de8757c1cb3ab4eb5da3da70b3b9ae27000fa8 Mon Sep 17 00:00:00 2001 From: Nicholas Tillmann Date: Thu, 22 Feb 2024 04:53:05 -0800 Subject: [PATCH 2/2] revert go.mod version to 1.20 Signed-off-by: Nicholas Tillmann --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a68ddab..0e70d66 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/IBM/mq2prom -go 1.22 +go 1.20 require ( github.com/eclipse/paho.mqtt.golang v1.4.3