Skip to content

Commit 26095d7

Browse files
sireeshajonnalagaddasireeshajonnalagadda
authored
[java]- Add support for debian trixie(13) (#1550)
* [java]- Add support for debian trixie(13) * change in Readme * comments addressed * Removing bullseye * Removing bullseye * Removing bullseye * review comments addressed
1 parent 754376b commit 26095d7

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎src/java/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Dockerfile uses separate build arguments instead of VARIANT
22
ARG TARGET_JAVA_VERSION=21
3-
ARG BASE_IMAGE_VERSION_CODENAME=bookworm
3+
ARG BASE_IMAGE_VERSION_CODENAME=trixie
44
FROM mcr.microsoft.com/devcontainers/base:${BASE_IMAGE_VERSION_CODENAME}
55

66
USER root

‎src/java/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/java |
12-
| *Available image variants* | 11 / 11-bookworm, 17 / 17-bookworm, 21 / 21-bookworm, 11-bullseye, 17-bullseye, 21-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
12+
| *Available image variants* | 11 / 11-trixie, 17 /17-trixie, , 21 / 21-trixie, 21-bookworm, 17-bookworm, 11-bookworm ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
1313
| *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 |
@@ -22,19 +22,19 @@ See **[history](history)** for information on the contents of published images.
2222
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.
2323

2424
- `mcr.microsoft.com/devcontainers/java` (latest)
25-
- `mcr.microsoft.com/devcontainers/java:21` (or `21-bookworm`, `21-bullseye` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/java:11` (or `17-bookworm`, `11-bullseye` to pin to an OS version)
27-
- `mcr.microsoft.com/devcontainers/java:17` (or `17-bookworm`, `17-bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/java:21` (or `21-trixie`, `21-bookworm` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/java:11` (or `11-trixie`, `11-bookworm` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/java:17` (or `17-trixie`, `17-bookworm` to pin to an OS version)
2828

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

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

33-
- `mcr.microsoft.com/devcontainers/java:1-11` (or `1-11-bookworm`, `1-11-bullseye` to pin to an OS version)
34-
- `mcr.microsoft.com/devcontainers/java:1.0-11` (or `1.0-11-bookworm`, `1.0-11-bullseye` to pin to an OS version)
35-
- `mcr.microsoft.com/devcontainers/java:1.0.0-11` (or `1.0.0-11-bookworm`, `1.0.0-11-bullseye` to pin to an OS version)
33+
- `mcr.microsoft.com/devcontainers/java:2-11` (or `2-11-trixie`, `2-11-bookworm` to pin to an OS version)
34+
- `mcr.microsoft.com/devcontainers/java:2.0-11` (or `2.0-11-trixie`, `2.0-11-bookworm` to pin to an OS version)
35+
- `mcr.microsoft.com/devcontainers/java:2.0.0-11` (or `2.0.0-11-trixie`, `2.0.0-11-bookworm` to pin to an OS version)
3636

37-
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-11`). 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.
37+
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-11`). 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.
3838

3939
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/java/tags/list).
4040

‎src/java/manifest.json‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
{
2-
"version": "1.1.24",
2+
"version": "2.0.0",
33
"variants": [
4+
"21-trixie",
5+
"17-trixie",
6+
"11-trixie",
47
"21-bookworm",
5-
"21-bullseye",
68
"17-bookworm",
7-
"17-bullseye",
8-
"11-bookworm",
9-
"11-bullseye"
9+
"11-bookworm"
1010
],
1111
"build": {
12-
"latest": "21-bookworm",
12+
"latest": "21-trixie",
1313
"rootDistro": "debian",
1414
"parent": "base-debian",
1515
"idMismatch": "true",
1616
"variantBuildArgs": {
17-
"21-bookworm": {
17+
"21-trixie": {
1818
"TARGET_JAVA_VERSION": "21",
19-
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
19+
"BASE_IMAGE_VERSION_CODENAME": "trixie"
2020
},
21-
"17-bookworm": {
21+
"17-trixie": {
2222
"TARGET_JAVA_VERSION": "17",
23-
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
23+
"BASE_IMAGE_VERSION_CODENAME": "trixie"
2424
},
25-
"11-bookworm": {
25+
"11-trixie": {
2626
"TARGET_JAVA_VERSION": "11",
27-
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
27+
"BASE_IMAGE_VERSION_CODENAME": "trixie"
2828
},
29-
"21-bullseye": {
29+
"21-bookworm": {
3030
"TARGET_JAVA_VERSION": "21",
31-
"BASE_IMAGE_VERSION_CODENAME": "bullseye"
31+
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
3232
},
33-
"17-bullseye": {
33+
"17-bookworm": {
3434
"TARGET_JAVA_VERSION": "17",
35-
"BASE_IMAGE_VERSION_CODENAME": "bullseye"
35+
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
3636
},
37-
"11-bullseye": {
37+
"11-bookworm": {
3838
"TARGET_JAVA_VERSION": "11",
39-
"BASE_IMAGE_VERSION_CODENAME": "bullseye"
39+
"BASE_IMAGE_VERSION_CODENAME": "bookworm"
4040
}
4141
},
4242
"architectures": {
43-
"21-bookworm": [
43+
"21-trixie": [
4444
"linux/amd64",
4545
"linux/arm64"
4646
],
47-
"17-bookworm": [
47+
"17-trixie": [
4848
"linux/amd64",
4949
"linux/arm64"
5050
],
51-
"11-bookworm": [
51+
"11-trixie": [
5252
"linux/amd64",
5353
"linux/arm64"
5454
],
55-
"21-bullseye": [
55+
"21-bookworm": [
5656
"linux/amd64",
5757
"linux/arm64"
5858
],
59-
"17-bullseye": [
59+
"17-bookworm": [
6060
"linux/amd64",
6161
"linux/arm64"
6262
],
63-
"11-bullseye": [
63+
"11-bookworm": [
6464
"linux/amd64",
6565
"linux/arm64"
6666
]
@@ -69,28 +69,28 @@
6969
"java:${VERSION}-${VARIANT}"
7070
],
7171
"variantTags": {
72-
"21-bookworm": [
72+
"21-trixie": [
7373
"java:${VERSION}-21",
74+
"java:${VERSION}-21-jdk-trixie",
75+
"java:${VERSION}-trixie"
76+
],
77+
"17-trixie": [
78+
"java:${VERSION}-17",
79+
"java:${VERSION}-17-jdk-trixie"
80+
],
81+
"11-trixie": [
82+
"java:${VERSION}-11",
83+
"java:${VERSION}-11-jdk-trixie"
84+
],
85+
"21-bookworm": [
7486
"java:${VERSION}-21-jdk-bookworm",
7587
"java:${VERSION}-bookworm"
7688
],
7789
"17-bookworm": [
78-
"java:${VERSION}-17",
7990
"java:${VERSION}-17-jdk-bookworm"
8091
],
8192
"11-bookworm": [
82-
"java:${VERSION}-11",
8393
"java:${VERSION}-11-jdk-bookworm"
84-
],
85-
"21-bullseye": [
86-
"java:${VERSION}-21-jdk-bullseye",
87-
"java:${VERSION}-bullseye"
88-
],
89-
"17-bullseye": [
90-
"java:${VERSION}-17-jdk-bullseye"
91-
],
92-
"11-bullseye": [
93-
"java:${VERSION}-11-jdk-bullseye"
9494
]
9595
}
9696
},

0 commit comments

Comments
 (0)