From e4b96bda28c14ac27aa12c51bc1dc9d890096238 Mon Sep 17 00:00:00 2001
From: whuwxl <whuwxl@gmail.com>
Date: Wed, 16 Aug 2023 01:24:14 +0800
Subject: [PATCH] Go & Go-postgres: Support 1.21 and drop buster (#194)

* Go & Go-postgres: Support 1.21

* Go & Go-postres: Drop buster

* 1.19 EOL

* update description

* update default variant

* version bump
---
 src/go-postgres/devcontainer-template.json | 17 +++++++----------
 src/go/devcontainer-template.json          | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json
index d5525b4c..67907adb 100644
--- a/src/go-postgres/devcontainer-template.json
+++ b/src/go-postgres/devcontainer-template.json
@@ -1,27 +1,24 @@
 {
     "id": "go-postgres",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "name": "Go & PostgreSQL",
     "description": "Use and develop Go + Postgres applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go-postgres",
     "publisher": "Dev Container Spec Maintainers",
     "licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
     "options": {
-		"imageVariant": {
+        "imageVariant": {
             "type": "string",
-            "description": "Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Go version:",
             "proposals": [
                 "1-bookworm",
+                "1.21-bookworm",
                 "1.20-bookworm",
-                "1.19-bookworm",
                 "1-bullseye",
-                "1.20-bullseye",
-                "1.19-bullseye",
-                "1-buster",
-                "1.20-buster",
-                "1.19-buster"
+                "1.21-bullseye",
+                "1.20-bullseye"
             ],
-            "default": "1.20-bullseye"
+            "default": "1.21-bullseye"
         }
     },
     "platforms": [
diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json
index 4e3db2e8..f069b14b 100644
--- a/src/go/devcontainer-template.json
+++ b/src/go/devcontainer-template.json
@@ -1,27 +1,24 @@
 {
     "id": "go",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "name": "Go",
     "description": "Develop Go based applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go",
     "publisher": "Dev Container Spec Maintainers",
     "licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
     "options": {
-		"imageVariant": {
+        "imageVariant": {
             "type": "string",
-            "description": "Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Go version:",
             "proposals": [
                 "1-bookworm",
+                "1.21-bookworm",
                 "1.20-bookworm",
-                "1.19-bookworm",
                 "1-bullseye",
-                "1.20-bullseye",
-                "1.19-bullseye",
-                "1-buster",
-                "1.20-buster",
-                "1.19-buster"
+                "1.21-bullseye",
+                "1.20-bullseye"
             ],
-            "default": "1.20-bullseye"
+            "default": "1.21-bullseye"
         }
     },
     "platforms": [