Skip to content

Commit 80a8f70

Browse files
authored
chore: support go 1.26 (#1776)
* chore: support go 1.26 * remove 1.25-bullseye references * bump version * remove references to bullseye in readme * preserve image ordering in manifest.json * wait they were in order
1 parent cbf706d commit 80a8f70

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed

src/go/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=1.25-trixie
1+
ARG VARIANT=1.26-trixie
22
FROM golang:${VARIANT}
33

44
# Fixing vulnerability issue by upgrading svn to 1.14.5. Ref https://subversion.apache.org/security/CVE-2024-46901-advisory.txt

src/go/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/devcontainers/go |
13-
| *Available image variants* | 1 / 1-bookworm, 1.25 / 1.25-trixie, 1.24 / 1.24-bookworm, 1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm`, and `bullseye` variants |
13+
| *Available image variants* | 1 / 1-trixie, 1.26 / 1.26-trixie, 1.25 / 1.25-bookworm, 1-bookworm ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm` variants |
1515
| *Container host OS support* | Linux, macOS, Windows |
1616
| *Container OS* | Debian |
1717
| *Languages, platforms* | Go |
@@ -23,19 +23,19 @@ See **[history](history)** for information on the contents of published images.
2323
You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
2424

2525
- `mcr.microsoft.com/devcontainers/go` (latest)
26-
- `mcr.microsoft.com/devcontainers/go:1` (or `1-trixie`, `1-bookworm`, `1-bullseye` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/go:1` (or `1-trixie`, `1-bookworm` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/go:1.26` (or `1.26-trixie`, `1.26-bookworm` to pin to an OS version)
2728
- `mcr.microsoft.com/devcontainers/go:1.25` (or `1.25-trixie`, `1.25-bookworm` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/go:1.24` (or `1.24-bookworm`, `1.24-bullseye` to pin to an OS version)
2929

3030
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3131

3232
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3333

34-
- `mcr.microsoft.com/devcontainers/go:2-1.25` (or `2-1.25-trixie`, `2-1.25-bookworm`)
35-
- `mcr.microsoft.com/devcontainers/go:2.0-1.25` (or `2.0-1.25-trixie`, `2.0-1.25-bookworm`)
36-
- `mcr.microsoft.com/devcontainers/go:2.0.8-1.25` (or `2.0.8-1.25-trixie`, `2.0.8-1.25-bookworm`)
34+
- `mcr.microsoft.com/devcontainers/go:2-1.26` (or `2-1.26-trixie`, `2-1.26-bookworm`)
35+
- `mcr.microsoft.com/devcontainers/go:2.0-1.26` (or `2.0-1.26-trixie`, `2.0-1.26-bookworm`)
36+
- `mcr.microsoft.com/devcontainers/go:2.0.8-1.26` (or `2.0.8-1.26-trixie`, `2.0.8-1.26-bookworm`)
3737

38-
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. `2-1.25`). 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.
38+
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. `2-1.26`). 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.
3939

4040
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).
4141

src/go/manifest.json

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,55 @@
11
{
2-
"version": "2.0.8",
2+
"version": "2.1.0",
33
"variants": [
4+
"1.26-trixie",
45
"1.25-trixie",
5-
"1.24-trixie",
6-
"1.25-bookworm",
7-
"1.24-bookworm",
8-
"1.24-bullseye"
6+
"1.26-bookworm",
7+
"1.25-bookworm"
98
],
109
"build": {
11-
"latest": "1.25-trixie",
10+
"latest": "1.26-trixie",
1211
"rootDistro": "debian",
1312
"tags": [
1413
"go:${VERSION}-${VARIANT}"
1514
],
1615
"architectures": {
17-
"1.25-trixie": [
18-
"linux/amd64",
19-
"linux/arm64"
20-
],
21-
"1.24-trixie": [
16+
"1.26-trixie": [
2217
"linux/amd64",
2318
"linux/arm64"
2419
],
25-
"1.25-bookworm": [
20+
"1.25-trixie": [
2621
"linux/amd64",
2722
"linux/arm64"
2823
],
29-
"1.24-bookworm": [
24+
"1.26-bookworm": [
3025
"linux/amd64",
3126
"linux/arm64"
3227
],
33-
"1.24-bullseye": [
28+
"1.25-bookworm": [
3429
"linux/amd64",
3530
"linux/arm64"
3631
]
3732
},
3833
"variantTags": {
39-
"1.25-trixie": [
40-
"go:${VERSION}-1.25",
34+
"1.26-trixie": [
35+
"go:${VERSION}-1.26",
4136
"go:${VERSION}-1",
4237
"go:${VERSION}-1-trixie",
4338
"go:${VERSION}-trixie"
4439
],
45-
"1.24-trixie": [
46-
"go:${VERSION}-1.24",
40+
"1.25-trixie": [
41+
"go:${VERSION}-1.25",
4742
"go:${VERSION}-1",
4843
"go:${VERSION}-1-trixie",
4944
"go:${VERSION}-trixie"
5045
],
51-
"1.25-bookworm": [
46+
"1.26-bookworm": [
5247
"go:${VERSION}-1-bookworm",
5348
"go:${VERSION}-bookworm"
5449
],
55-
"1.24-bookworm": [
50+
"1.25-bookworm": [
5651
"go:${VERSION}-1-bookworm",
5752
"go:${VERSION}-bookworm"
58-
],
59-
"1.24-bullseye": [
60-
"go:${VERSION}-1-bullseye",
61-
"go:${VERSION}-bullseye"
6253
]
6354
}
6455
},

0 commit comments

Comments
 (0)