diff --git a/.go-version b/.go-version index 2a0ba77c..013173af 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.4 +1.22.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index f880e63b..dd1aca79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## UNRELEASED IMPROVEMENTS: - * build: Updated to Go 1.22.4 [[GH-916](https://github.com/hashicorp/nomad-autoscaler/pull/916)] + * build: Updated to Go 1.22.6 and alpine to 3.20 [[GH-943](https://github.com/hashicorp/nomad-autoscaler/pull/943)] ## 0.4.4 (June 4, 2024) diff --git a/Dockerfile b/Dockerfile index 78b31d67..04ebf1c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ # devbuild compiles the binary # ----------------------------------- -FROM golang:1.21 AS devbuild +FROM golang:1.22 AS devbuild # Disable CGO to make sure we build static binaries ENV CGO_ENABLED=0 @@ -22,7 +22,7 @@ RUN go build -o nomad-autoscaler . # dev runs the binary from devbuild # ----------------------------------- -FROM alpine:3.15 AS dev +FROM alpine:3.20 AS dev COPY --from=devbuild /build/nomad-autoscaler /bin/ COPY ./scripts/docker-entrypoint.sh / @@ -35,7 +35,7 @@ CMD ["help"] # Release images. # =================================== -FROM alpine:3.15 AS release +FROM alpine:3.20 AS release ARG PRODUCT_NAME=nomad-autoscaler ARG PRODUCT_VERSION diff --git a/go.mod b/go.mod index 4362c651..e2c652ce 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-autoscaler -go 1.21 +go 1.22 require ( github.com/Azure/azure-sdk-for-go v68.0.0+incompatible diff --git a/plugins/test/noop-apm/go.mod b/plugins/test/noop-apm/go.mod index 8da8f29b..97d720a1 100644 --- a/plugins/test/noop-apm/go.mod +++ b/plugins/test/noop-apm/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-autoscaler/plugins/test/noop-apm -go 1.21 +go 1.22 require ( github.com/hashicorp/go-hclog v1.6.3 diff --git a/plugins/test/noop-strategy/go.mod b/plugins/test/noop-strategy/go.mod index 79667816..d605238f 100644 --- a/plugins/test/noop-strategy/go.mod +++ b/plugins/test/noop-strategy/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-autoscaler/plugins/test/noop-strategy -go 1.21 +go 1.22 require ( github.com/hashicorp/go-hclog v1.6.3 diff --git a/plugins/test/noop-target/go.mod b/plugins/test/noop-target/go.mod index 7a944056..f86b92ff 100644 --- a/plugins/test/noop-target/go.mod +++ b/plugins/test/noop-target/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-autoscaler/plugins/test/noop-target -go 1.21 +go 1.22 require ( github.com/hashicorp/go-hclog v1.6.3