Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit ddc1134

Browse files
ChuxelChuxel
authored
Add Go 1.18 images, drop 1.16 (#1340)
1 parent 4dcb7f8 commit ddc1134

File tree

8 files changed

+22
-24
lines changed

8 files changed

+22
-24
lines changed

‎containers/go-postgres/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
1+
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.18, 1.17, 1-bullseye, 1.18-bullseye, 1.17-bullseye, 1-buster, 1.18-buster, 1.17-buster
22
ARG VARIANT=1-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
44

‎containers/go-postgres/.devcontainer/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
context: .
1010
dockerfile: Dockerfile
1111
args:
12-
# [Choice] Go version 1, 1.16, 1.17
12+
# [Choice] Go version 1, 1.18, 1.17
1313
# Append -bullseye or -buster to pin to an OS version.
1414
# Use -bullseye variants on local arm64/Apple Silicon.
1515
VARIANT: 1-bullseye

‎containers/go-postgres/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build:
4040
context: .
4141
dockerfile: Dockerfile
4242
args:
43-
# [Choice] Go version 1, 1.16, 1.17
43+
# [Choice] Go version 1, 1.18, 1.17
4444
# Append -bullseye or -buster to pin to an OS version.
4545
# Use -bullseye variants on local arm64/Apple Silicon.
4646
VARIANT: 1.17

‎containers/go/.devcontainer/base.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
1+
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.18, 1.17, 1-bullseye, 1.18-bullseye, 1.17-bullseye, 1-buster, 1.18-buster, 1.17-buster
22
ARG VARIANT=1-bullseye
33
FROM golang:${VARIANT}
44

‎containers/go/.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
6+
// Update the VARIANT arg to pick a version of Go: 1, 1.18, 1.17
77
// Append -bullseye or -buster to pin to an OS version.
88
// Use -bullseye variants on local arm64/Apple Silicon.
99
"VARIANT": "1-bullseye",
@@ -17,8 +17,7 @@
1717
"settings": {
1818
"go.toolsManagement.checkForUpdates": "local",
1919
"go.useLanguageServer": true,
20-
"go.gopath": "/go",
21-
"go.goroot": "/usr/local/go"
20+
"go.gopath": "/go"
2221
},
2322

2423
// Add the IDs of extensions you want installed when the container is created.

‎containers/go/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/vscode/devcontainers/go |
13-
| *Available image variants* | 1 / 1-bullseye, 1.16 / 1.16-bullseye, 1.17 / 1.17-bullseye, 1-buster, 1.17-buster, 1.16-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/go/tags/list)) |
13+
| *Available image variants* | 1 / 1-bullseye, 1.18 / 1.18-bullseye, 1.17 / 1.17-bullseye, 1-buster, 1.18-buster, 1.17-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/go/tags/list)) |
1414
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
1515
| *Works in Codespaces* | Yes |
1616
| *Container host OS support* | Linux, macOS, Windows |
@@ -32,14 +32,14 @@ You can also directly reference pre-built versions of `.devcontainer/base.Docker
3232

3333
- `mcr.microsoft.com/vscode/devcontainers/go` (latest)
3434
- `mcr.microsoft.com/vscode/devcontainers/go:1` (or `1-bullseye`, `1-buster` to pin to an OS version)
35-
- `mcr.microsoft.com/vscode/devcontainers/go:1.16` (or `1.16-bullseye`, `1.16-buster` to pin to an OS version)
3635
- `mcr.microsoft.com/vscode/devcontainers/go:1.17` (or `1.17-bullseye`, `1.17-buster` to pin to an OS version)
36+
- `mcr.microsoft.com/vscode/devcontainers/go:1.18` (or `1.18-bullseye`, `1.18-buster` to pin to an OS version)
3737

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

40-
- `mcr.microsoft.com/vscode/devcontainers/go:0-1.16` (or `0-1.16-bullseye`, `0-1.16-buster`)
41-
- `mcr.microsoft.com/vscode/devcontainers/go:0.205-1.16` (or `0.205-1.16-bullseye`, `0.205-1.16-buster`)
42-
- `mcr.microsoft.com/vscode/devcontainers/go:0.205.0-1.16` (or `0.205.0-1.16-bullseye`, `0.205.0-1.16-buster`)
40+
- `mcr.microsoft.com/vscode/devcontainers/go:0-1.18` (or `0-1.18-bullseye`, `0-1.18-buster`)
41+
- `mcr.microsoft.com/vscode/devcontainers/go:0.206-1.18` (or `0.205-1.18-bullseye`, `0.205-1.18-buster`)
42+
- `mcr.microsoft.com/vscode/devcontainers/go:0.206.0-1.18` (or `0.205.0-1.18-bullseye`, `0.205.0-1.18-buster`)
4343

4444
However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-1.16`). 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.
4545

‎containers/go/definition-manifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"variants": ["1.17-bullseye", "1.16-bullseye", "1.17-buster", "1.16-buster"],
3-
"definitionVersion": "0.205.4",
2+
"variants": ["1.18-bullseye", "1.18-buster", "1.17-bullseye", "1.17-buster"],
3+
"definitionVersion": "0.206.0",
44
"build": {
5-
"latest": "1.17-bullseye",
5+
"latest": "1.18-bullseye",
66
"rootDistro": "debian",
77
"tags": [
88
"go:${VERSION}-${VARIANT}"
99
],
1010
"architectures": {
11+
"1.18-bullseye": ["linux/amd64", "linux/arm64"],
1112
"1.17-bullseye": ["linux/amd64", "linux/arm64"],
12-
"1.16-bullseye": ["linux/amd64", "linux/arm64"],
13-
"1.17-buster": ["linux/amd64"],
14-
"1.16-buster": ["linux/amd64"]
13+
"1.18-buster": ["linux/amd64"],
14+
"1.17-buster": ["linux/amd64"]
1515
},
1616
"variantTags": {
17-
"1.17-bullseye": [
18-
"go:${VERSION}-1.17",
17+
"1.18-bullseye": [
18+
"go:${VERSION}-1.18",
1919
"go:${VERSION}-1",
2020
"go:${VERSION}-1-bullseye",
2121
"go:${VERSION}-bullseye"
2222
],
23-
"1.16-bullseye": ["go:${VERSION}-1.16"],
24-
"1.17-buster": [
23+
"1.18-buster": [
2524
"go:${VERSION}-1-buster",
2625
"go:${VERSION}-buster"
27-
]
26+
],
27+
"1.17-bullseye": ["go:${VERSION}-1.17"]
2828
}
2929
},
3030
"dependencies": {

‎script-library/container-features/src/devcontainer-features.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@
733733
"extensions": ["golang.Go"],
734734
"containerEnv": {
735735
"GOPATH": "/go",
736-
"GOROOT": "/usr/local/go",
737736
"PATH": "${GOPATH}/bin:${GOROOT}/bin:${PATH}"
738737
},
739738
"capAdd": [ "SYS_PTRACE" ],

0 commit comments

Comments
 (0)