From 4828efe3844f92a9802aba9831b3567d79f9c958 Mon Sep 17 00:00:00 2001
From: Mingyuan Wu <my.wu@outlook.com>
Date: Wed, 26 Feb 2025 04:17:06 +0800
Subject: [PATCH] chore: support go 1.24 (#1304)

---
 src/go/.devcontainer/Dockerfile |  2 +-
 src/go/README.md                | 11 ++++++-----
 src/go/manifest.json            | 22 +++++++++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/go/.devcontainer/Dockerfile b/src/go/.devcontainer/Dockerfile
index 672785336..a8a77f930 100644
--- a/src/go/.devcontainer/Dockerfile
+++ b/src/go/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG VARIANT=1.23-bookworm
+ARG VARIANT=1.24-bookworm
 FROM golang:${VARIANT}
 
 # [Optional] Uncomment the next line to use go get to install anything else you need
diff --git a/src/go/README.md b/src/go/README.md
index 137efca97..c8c049bc4 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -10,7 +10,7 @@
 | *Categories* | Core, Languages |
 | *Definition type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/go |
-| *Available image variants* | 1 / 1-bookworm, 1.23 / 1.23-bookworm, 1.22 / 1.22-bookworm, 1-bullseye, 1.22-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
+| *Available image variants* | 1 / 1-bookworm, 1.24 / 1.24-bookworm, 1.23 / 1.23-bookworm, 1.22 / 1.22-bookworm, 1-bullseye, 1.22-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -24,6 +24,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/go` (latest)
 - `mcr.microsoft.com/devcontainers/go:1` (or `1-bookworm`, `1-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/go:1.24` (or `1.24-bookworm`, `1.24-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/go:1.23` (or `1.23-bookworm`, `1.23-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/go:1.22` (or `1.22-bookworm`, `1.22-bullseye` to pin to an OS version)
 
@@ -31,11 +32,11 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/devcontainers/go:1-1.23` (or `1-1.23-bookworm`, `1-1.23-bullseye`)
-- `mcr.microsoft.com/devcontainers/go:1.2-1.23` (or `1.2-1.23-bookworm`, `1.2-1.23-bullseye`)
-- `mcr.microsoft.com/devcontainers/go:1.2.0-1.23` (or `1.2.0-1.23-bookworm`, `1.2.0-1.23-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1-1.24` (or `1-1.24-bookworm`, `1-1.24-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1.4-1.24` (or `1.4-1.24-bookworm`, `1.4-1.24-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1.4.0-1.24` (or `1.4.0-1.24-bookworm`, `1.4.0-1.24-bullseye`)
 
-However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `1-1.23`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
+However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `1-1.24`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/go/tags/list).
 
diff --git a/src/go/manifest.json b/src/go/manifest.json
index 746ee2e86..1ff09d4b2 100644
--- a/src/go/manifest.json
+++ b/src/go/manifest.json
@@ -1,18 +1,24 @@
 {
   "version": "1.3.3",
   "variants": [
+    "1.24-bookworm",
     "1.23-bookworm",
     "1.22-bookworm",
+    "1.24-bullseye",
     "1.23-bullseye",
     "1.22-bullseye"
   ],
   "build": {
-    "latest": "1.23-bookworm",
+    "latest": "1.24-bookworm",
     "rootDistro": "debian",
     "tags": [
       "go:${VERSION}-${VARIANT}"
     ],
     "architectures": {
+      "1.24-bookworm": [
+        "linux/amd64",
+        "linux/arm64"
+      ],
       "1.23-bookworm": [
         "linux/amd64",
         "linux/arm64"
@@ -21,6 +27,10 @@
         "linux/amd64",
         "linux/arm64"
       ],
+      "1.24-bullseye": [
+        "linux/amd64",
+        "linux/arm64"
+      ],
       "1.23-bullseye": [
         "linux/amd64",
         "linux/arm64"
@@ -31,6 +41,12 @@
       ]
     },
     "variantTags": {
+      "1.24-bookworm": [
+        "go:${VERSION}-1.24",
+        "go:${VERSION}-1",
+        "go:${VERSION}-1-bookworm",
+        "go:${VERSION}-bookworm"
+      ],
       "1.23-bookworm": [
         "go:${VERSION}-1.23",
         "go:${VERSION}-1",
@@ -40,6 +56,10 @@
       "1.22-bookworm": [
         "go:${VERSION}-1.22"
       ],
+      "1.24-bullseye": [
+        "go:${VERSION}-1-bullseye",
+        "go:${VERSION}-bullseye"
+      ],
       "1.23-bullseye": [
         "go:${VERSION}-1-bullseye",
         "go:${VERSION}-bullseye"