From ad31c812ae54434623714d85ba12d9082076809f Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Wed, 17 Sep 2025 13:25:40 -0700 Subject: [PATCH] Update to go1.24 Signed-off-by: Brian Goff --- packages/moby-buildx/go_version.go | 2 +- packages/moby-compose/go_version.go | 25 +------------------------ packages/moby-containerd/go_version.go | 2 +- pkg/goversion/version.go | 4 ++-- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/packages/moby-buildx/go_version.go b/packages/moby-buildx/go_version.go index 63f9cc2..5dacbc1 100644 --- a/packages/moby-buildx/go_version.go +++ b/packages/moby-buildx/go_version.go @@ -6,5 +6,5 @@ import ( ) func GoVersion(_ *archive.Spec) string { - return goversion.OneTwentyThree + return goversion.OneTwentyFour } diff --git a/packages/moby-compose/go_version.go b/packages/moby-compose/go_version.go index e980960..4dcd408 100644 --- a/packages/moby-compose/go_version.go +++ b/packages/moby-compose/go_version.go @@ -1,33 +1,10 @@ package compose import ( - "strings" - "github.com/Azure/moby-packaging/pkg/archive" "github.com/Azure/moby-packaging/pkg/goversion" - "github.com/Masterminds/semver/v3" -) - -const ( - threshold = "2.22.0" ) func GoVersion(s *archive.Spec) string { - tag, _, _ := strings.Cut(s.Tag, "~") - - v, err := semver.NewVersion(tag) - if err != nil { - return goversion.DefaultVersion - } - - t, err := semver.NewVersion(threshold) - if err != nil { - return goversion.DefaultVersion - } - - if v.Compare(t) >= 0 { // if v >= t - return goversion.OneTwentyThree - } - - return goversion.DefaultVersion + return goversion.OneTwentyFour } diff --git a/packages/moby-containerd/go_version.go b/packages/moby-containerd/go_version.go index 9da269b..3134582 100644 --- a/packages/moby-containerd/go_version.go +++ b/packages/moby-containerd/go_version.go @@ -6,5 +6,5 @@ import ( ) func GoVersion(spec *archive.Spec) string { - return goversion.OneTwentyThree + return goversion.OneTwentyFour } diff --git a/pkg/goversion/version.go b/pkg/goversion/version.go index 5eae8cc..3bef8e3 100644 --- a/pkg/goversion/version.go +++ b/pkg/goversion/version.go @@ -1,6 +1,6 @@ package goversion const ( - DefaultVersion = OneTwentyThree - OneTwentyThree = "1.23.12" + DefaultVersion = OneTwentyFour + OneTwentyFour = "1.24.7" )