From 2ddbc38ed4469a62d2731bf1a0825eab995733e4 Mon Sep 17 00:00:00 2001 From: whuwxl Date: Fri, 11 Aug 2023 12:04:34 +0800 Subject: [PATCH 1/6] Go & Go-postgres: Support 1.21 --- src/go-postgres/devcontainer-template.json | 4 +++- src/go/devcontainer-template.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index d5525b4c..e1e74c61 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -7,14 +7,16 @@ "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):", "proposals": [ "1-bookworm", + "1.21-bookworm", "1.20-bookworm", "1.19-bookworm", "1-bullseye", + "1.21-bullseye", "1.20-bullseye", "1.19-bullseye", "1-buster", diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json index 4e3db2e8..1bcbd555 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -7,14 +7,16 @@ "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):", "proposals": [ "1-bookworm", + "1.21-bookworm", "1.20-bookworm", "1.19-bookworm", "1-bullseye", + "1.21-bullseye", "1.20-bullseye", "1.19-bullseye", "1-buster", From c2361536659318af8637b8726e732c95b039f5e6 Mon Sep 17 00:00:00 2001 From: whuwxl Date: Fri, 11 Aug 2023 12:05:57 +0800 Subject: [PATCH 2/6] Go & Go-postres: Drop buster --- src/go-postgres/devcontainer-template.json | 5 +---- src/go/devcontainer-template.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index e1e74c61..ec1698d0 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -18,10 +18,7 @@ "1-bullseye", "1.21-bullseye", "1.20-bullseye", - "1.19-bullseye", - "1-buster", - "1.20-buster", - "1.19-buster" + "1.19-bullseye" ], "default": "1.20-bullseye" } diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json index 1bcbd555..e3f1f62f 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -18,10 +18,7 @@ "1-bullseye", "1.21-bullseye", "1.20-bullseye", - "1.19-bullseye", - "1-buster", - "1.20-buster", - "1.19-buster" + "1.19-bullseye" ], "default": "1.20-bullseye" } From 29a430c2fc74fca61b6b189caefa571a5f314565 Mon Sep 17 00:00:00 2001 From: whuwxl Date: Sat, 12 Aug 2023 07:21:12 +0800 Subject: [PATCH 3/6] 1.19 EOL --- src/go-postgres/devcontainer-template.json | 4 +--- src/go/devcontainer-template.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index ec1698d0..62a60085 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -14,11 +14,9 @@ "1-bookworm", "1.21-bookworm", "1.20-bookworm", - "1.19-bookworm", "1-bullseye", "1.21-bullseye", - "1.20-bullseye", - "1.19-bullseye" + "1.20-bullseye" ], "default": "1.20-bullseye" } diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json index e3f1f62f..aa14a1a4 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -14,11 +14,9 @@ "1-bookworm", "1.21-bookworm", "1.20-bookworm", - "1.19-bookworm", "1-bullseye", "1.21-bullseye", - "1.20-bullseye", - "1.19-bullseye" + "1.20-bullseye" ], "default": "1.20-bullseye" } From eefda70e1c2adc386ee441cb9a7e706f46f42be0 Mon Sep 17 00:00:00 2001 From: whuwxl Date: Sat, 12 Aug 2023 07:23:14 +0800 Subject: [PATCH 4/6] update description --- src/go-postgres/devcontainer-template.json | 2 +- src/go/devcontainer-template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index 62a60085..0eebdde2 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -9,7 +9,7 @@ "options": { "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", diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json index aa14a1a4..cefadfe8 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -9,7 +9,7 @@ "options": { "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", From 95274e08dc4c590ad3872113ef907b8ef4cb176a Mon Sep 17 00:00:00 2001 From: whuwxl Date: Sat, 12 Aug 2023 07:26:23 +0800 Subject: [PATCH 5/6] update default variant --- src/go-postgres/devcontainer-template.json | 2 +- src/go/devcontainer-template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index 0eebdde2..abbca833 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -18,7 +18,7 @@ "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 cefadfe8..ace9cd69 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -18,7 +18,7 @@ "1.21-bullseye", "1.20-bullseye" ], - "default": "1.20-bullseye" + "default": "1.21-bullseye" } }, "platforms": [ From e0b4f5562c85816264b573d938e636f2a8566eac Mon Sep 17 00:00:00 2001 From: whuwxl Date: Sat, 12 Aug 2023 07:33:55 +0800 Subject: [PATCH 6/6] version bump --- src/go-postgres/devcontainer-template.json | 2 +- src/go/devcontainer-template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json index abbca833..67907adb 100644 --- a/src/go-postgres/devcontainer-template.json +++ b/src/go-postgres/devcontainer-template.json @@ -1,6 +1,6 @@ { "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", diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json index ace9cd69..f069b14b 100644 --- a/src/go/devcontainer-template.json +++ b/src/go/devcontainer-template.json @@ -1,6 +1,6 @@ { "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",