Skip to content

Commit 8d71301

Browse files
samruddhikhandalesamruddhikhandale
authored
Images: Support debian:bookworm (devcontainers#630)
* Images: Support debian:bookworm * add pages * update version
1 parent 58fb4e7 commit 8d71301

File tree

19 files changed

+154
-79
lines changed

19 files changed

+154
-79
lines changed

‎.github/workflows/push-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: "github.ref == 'refs/heads/main'"
1212
strategy:
1313
matrix:
14-
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58]
15-
page-total: [58]
14+
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66]
15+
page-total: [66]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

‎.github/workflows/push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: ${{ github.event.base_ref == 'refs/heads/main' }}
1212
strategy:
1313
matrix:
14-
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58]
15-
page-total: [58]
14+
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66]
15+
page-total: [66]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"--page",
2020
"1",
2121
"--pageTotal",
22-
"55"
22+
"66"
2323
],
2424
"console": "integratedTerminal",
2525
}

‎src/go/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.20, 1.19, 1-bullseye, 1.20-bullseye, 1.19-bullseye, 1-buster, 1.20-buster, 1.19-buster
2-
ARG VARIANT=1.20-bullseye
1+
# [Choice] Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): 1, 1.20, 1.19, 1-bookworm, 1.20-bookworm, 1.19-bookworm, 1-bullseye, 1.20-bullseye, 1.19-bullseye, 1-buster, 1.20-buster, 1.19-buster
2+
ARG VARIANT=1.20-bookworm
33
FROM golang:${VARIANT}
44

55
# [Optional] Uncomment the next line to use go get to install anything else you need

‎src/go/README.md‎

Lines changed: 9 additions & 9 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-bullseye, 1.20 / 1.20-bullseye, 1.19 / 1.19-bullseye, 1-buster, 1.20-buster, 1.19-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
13+
| *Available image variants* | 1 / 1-bookworm, 1.20 / 1.20-bookworm, 1.19 / 1.19-bookworm, 1-bullseye, 1.20-bullseye, 1.19-bullseye, 1-buster, 1.20-buster, 1.19-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` 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-bullseye`, `1-buster` to pin to an OS version)
27-
- `mcr.microsoft.com/devcontainers/go:1.20` (or `1.20-bullseye`, `1.20-buster` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/go:1.19` (or `1.19-bullseye`, `1.19-buster` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/go:1` (or `1-bookworm`, `1-bullseye`, `1-buster` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/go:1.20` (or `1.20-bookworm`, `1.20-bullseye`, `1.20-buster` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/go:1.19` (or `1.19-bookworm`, `1.19-bullseye`, `1.19-buster` 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:0-1.20` (or `0-1.20-bullseye`, `0-1.20-buster`)
35-
- `mcr.microsoft.com/devcontainers/go:0.207-1.20` (or `0.207-1.20-bullseye`, `0.207-1.20-buster`)
36-
- `mcr.microsoft.com/devcontainers/go:0.207.15-1.20` (or `0.207.1-1.20-bullseye`, `0.207.1-1.20-buster`)
34+
- `mcr.microsoft.com/devcontainers/go:1-1.20` (or `1-1.20-bullseye`, `1-1.20-buster`)
35+
- `mcr.microsoft.com/devcontainers/go:1.0-1.20` (or `1.0-1.20-bullseye`, `1.0-1.20-buster`)
36+
- `mcr.microsoft.com/devcontainers/go:1.0.0-1.20` (or `1.0.0-1.20-bullseye`, `1.0.0-1.20-buster`)
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. `0-1.20`). 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. `1-1.20`). 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: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
{
22
"version": "0.207.21",
33
"variants": [
4+
"1.20-bookworm",
45
"1.20-bullseye",
56
"1.20-buster",
7+
"1.19-bookworm",
68
"1.19-bullseye",
79
"1.19-buster"
810
],
911
"build": {
10-
"latest": "1.20-bullseye",
12+
"latest": "1.20-bookworm",
1113
"rootDistro": "debian",
1214
"tags": [
1315
"go:${VERSION}-${VARIANT}"
1416
],
1517
"architectures": {
18+
"1.20-bookworm": [
19+
"linux/amd64",
20+
"linux/arm64"
21+
],
22+
"1.19-bookworm": [
23+
"linux/amd64",
24+
"linux/arm64"
25+
],
1626
"1.20-bullseye": [
1727
"linux/amd64",
1828
"linux/arm64"
@@ -29,17 +39,21 @@
2939
]
3040
},
3141
"variantTags": {
32-
"1.20-bullseye": [
42+
"1.20-bookworm": [
3343
"go:${VERSION}-1.20",
3444
"go:${VERSION}-1",
45+
"go:${VERSION}-1-bookworm",
46+
"go:${VERSION}-bookworm"
47+
],
48+
"1.20-bullseye": [
3549
"go:${VERSION}-1-bullseye",
3650
"go:${VERSION}-bullseye"
3751
],
3852
"1.20-buster": [
3953
"go:${VERSION}-1-buster",
4054
"go:${VERSION}-buster"
4155
],
42-
"1.19-bullseye": [
56+
"1.19-bookworm": [
4357
"go:${VERSION}-1.19"
4458
]
4559
}

‎src/go/test-project/test-utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ checkCommon()
126126
libc6 \
127127
libgcc1 \
128128
libgssapi-krb5-2 \
129-
liblttng-ust0 \
129+
liblttng-ust1 \
130130
libstdc++6 \
131131
zlib1g \
132132
locales \

‎src/python/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
2-
ARG VARIANT=3-bullseye
1+
# [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 3, 3.11, 3.10, 3.9, 3.8, 3.7, 3-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3.8-bookworm, 3.7-bookworm, 3-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3-buster, 3.11-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster
2+
ARG VARIANT=3-bookworm
33
FROM python:${VARIANT}
44

55
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

‎src/python/README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/python |
12-
| *Available image variants* | 3 / 3-bullseye, 3.7 / 3.7-bullseye, 3.8 / 3.8-bullseye, 3.9 / 3.9-bullseye, 3.10 / 3.10-bullseye, 3.11-bullseye, 3.11, 3-buster, 3.7-buster, 3.8-buster, 3.9-buster, 3.10-buster, 3.11-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
12+
| *Available image variants* | 3 / 3-bookworm, 3.7 / 3.7-bookworm, 3.8 / 3.8-bookworm, 3.9 / 3.9-bookworm, 3.10 / 3.10-bookworm, 3.11-bookworm, 3.11, 3-bullseye, 3.7-bullseye, 3.8-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 3.7-buster, 3.8-buster, 3.9-buster, 3.10-buster, 3.11-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
1414
| *Container Host OS Support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
1616
| *Languages, platforms* | Python |
@@ -23,22 +23,22 @@ See **[history](history)** for information on the contents of published images.
2323

2424
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` with one of the following:
2525

26-
- `mcr.microsoft.com/devcontainers/python:3` (latest)
27-
- `mcr.microsoft.com/devcontainers/python:3.7` (or `3.7-bullseye`, `3.7-buster` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/python:3.8` (or `3.8-bullseye`, `3.8-buster` to pin to an OS version)
29-
- `mcr.microsoft.com/devcontainers/python:3.9` (or `3.9-bullseye`, `3.9-buster` to pin to an OS version)
30-
- `mcr.microsoft.com/devcontainers/python:3.10` (or `3.10-bullseye`, `3.10-buster` to pin to an OS version)
31-
- `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-bullseye`, `3.11-buster` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/python:3` (latest)
27+
- `mcr.microsoft.com/devcontainers/python:3.7` (or `3.7-bookworm`, `3.7-bullseye`, `3.7-buster` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/python:3.8` (or `3.8-bookworm`, `3.8-bullseye`, `3.8-buster` to pin to an OS version)
29+
- `mcr.microsoft.com/devcontainers/python:3.9` (or `3.9-bookworm`, `3.9-bullseye`, `3.9-buster` to pin to an OS version)
30+
- `mcr.microsoft.com/devcontainers/python:3.10` (or `3.10-bookworm`, `3.10-bullseye`, `3.10-buster` to pin to an OS version)
31+
- `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-bookworm`, `3.11-bullseye`, `3.11-buster` to pin to an OS version)
3232

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

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

37-
- `mcr.microsoft.com/devcontainers/python:0-3.9` (or `0-3.9-bullseye`, `0-3.9-buster`)
38-
- `mcr.microsoft.com/devcontainers/python:0.203-3.9` (or `0.203-3.9-bullseye`, `0.203-3.9-buster`)
39-
- `mcr.microsoft.com/devcontainers/python:0.202.5-3.9` (or `0.202.5-3.9-bullseye`, `0.202.5-3.9-buster`)
37+
- `mcr.microsoft.com/devcontainers/python:1-3.9` (or `1-3.9-bullseye`, `1-3.9-buster`)
38+
- `mcr.microsoft.com/devcontainers/python:1.0-3.9` (or `1.0-3.9-bullseye`, `1.0-3.9-buster`)
39+
- `mcr.microsoft.com/devcontainers/python:1.0.0-3.9` (or `1.0.0-3.9-bullseye`, `1.0.0-3.9-buster`)
4040

41-
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. `0-14`). 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.
41+
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-14`). 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.
4242

4343
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/python/tags/list).
4444

‎src/python/manifest.json‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"version": "0.204.11",
33
"variants": [
4+
"3.11-bookworm",
5+
"3.10-bookworm",
6+
"3.9-bookworm",
7+
"3.8-bookworm",
8+
"3.7-bookworm",
49
"3.11-bullseye",
510
"3.10-bullseye",
611
"3.9-bullseye",
@@ -13,9 +18,29 @@
1318
"3.7-buster"
1419
],
1520
"build": {
16-
"latest": "3.11-bullseye",
21+
"latest": "3.11-bookworm",
1722
"rootDistro": "debian",
1823
"architectures": {
24+
"3.11-bookworm": [
25+
"linux/amd64",
26+
"linux/arm64"
27+
],
28+
"3.10-bookworm": [
29+
"linux/amd64",
30+
"linux/arm64"
31+
],
32+
"3.9-bookworm": [
33+
"linux/amd64",
34+
"linux/arm64"
35+
],
36+
"3.8-bookworm": [
37+
"linux/amd64",
38+
"linux/arm64"
39+
],
40+
"3.7-bookworm": [
41+
"linux/amd64",
42+
"linux/arm64"
43+
],
1944
"3.11-bullseye": [
2045
"linux/amd64",
2146
"linux/arm64"
@@ -56,24 +81,28 @@
5681
"python:${VERSION}-${VARIANT}"
5782
],
5883
"variantTags": {
59-
"3.11-bullseye": [
84+
"3.11-bookworm": [
6085
"python:${VERSION}-3.11",
6186
"python:${VERSION}-3",
62-
"python:${VERSION}-3-bullseye",
63-
"python:${VERSION}-bullseye"
87+
"python:${VERSION}-3-bookworm",
88+
"python:${VERSION}-bookworm"
6489
],
65-
"3.10-bullseye": [
90+
"3.10-bookworm": [
6691
"python:${VERSION}-3.10"
6792
],
68-
"3.9-bullseye": [
93+
"3.9-bookworm": [
6994
"python:${VERSION}-3.9"
7095
],
71-
"3.8-bullseye": [
96+
"3.8-bookworm": [
7297
"python:${VERSION}-3.8"
7398
],
74-
"3.7-bullseye": [
99+
"3.7-bookworm": [
75100
"python:${VERSION}-3.7"
76101
],
102+
"3.11-bullseye": [
103+
"python:${VERSION}-3-bullseye",
104+
"python:${VERSION}-bullseye"
105+
],
77106
"3.11-buster": [
78107
"python:${VERSION}-3-buster",
79108
"python:${VERSION}-buster"

0 commit comments

Comments
 (0)