From cf9d0e3fef54d12f4ddbe9308531d7197537dc78 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Mon, 15 Sep 2025 07:12:27 +0000 Subject: [PATCH 1/2] [java,java-postgres]- Add support for debian trixie(13) --- src/java-postgres/.devcontainer/Dockerfile | 2 +- src/java-postgres/README.md | 2 +- src/java-postgres/devcontainer-template.json | 7 +++++-- src/java/.devcontainer/devcontainer.json | 2 +- src/java/README.md | 2 +- src/java/devcontainer-template.json | 7 +++++-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/java-postgres/.devcontainer/Dockerfile b/src/java-postgres/.devcontainer/Dockerfile index 13cbe7e5..2a8e1b39 100644 --- a/src/java-postgres/.devcontainer/Dockerfile +++ b/src/java-postgres/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/java:2-${templateOption:imageVariant} ARG INSTALL_MAVEN="${templateOption:installMaven}" ARG MAVEN_VERSION="" diff --git a/src/java-postgres/README.md b/src/java-postgres/README.md index b06733bb..cb493ea5 100644 --- a/src/java-postgres/README.md +++ b/src/java-postgres/README.md @@ -7,7 +7,7 @@ Develop applications with Java and PostgreSQL. Includes a Java application conta | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-bullseye | +| imageVariant | Java version (use -trixie, or -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-trixie | | installMaven | Install Maven, a management tool for Java | boolean | false | | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false | diff --git a/src/java-postgres/devcontainer-template.json b/src/java-postgres/devcontainer-template.json index 23d07574..68fb079b 100644 --- a/src/java-postgres/devcontainer-template.json +++ b/src/java-postgres/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "java-postgres", - "version": "4.0.2", + "version": "5.0.0", "name": "Java & PostgreSQL", "description": "Develop applications with Java and PostgreSQL. Includes a Java application container and PostgreSQL server.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java-postgres", @@ -11,6 +11,9 @@ "type": "string", "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "21-trixie", + "17-trixie", + "11-trixie", "21-bookworm", "17-bookworm", "11-bookworm", @@ -20,7 +23,7 @@ "11-bullseye", "8-bullseye" ], - "default": "21-bullseye" + "default": "21-trixie" }, "installMaven": { "type": "boolean", diff --git a/src/java/.devcontainer/devcontainer.json b/src/java/.devcontainer/devcontainer.json index 4664b357..62d17fd2 100644 --- a/src/java/.devcontainer/devcontainer.json +++ b/src/java/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Java", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant}", + "image": "mcr.microsoft.com/devcontainers/java:2-${templateOption:imageVariant}", "features": { "ghcr.io/devcontainers/features/java:1": { diff --git a/src/java/README.md b/src/java/README.md index 96977c3d..cd359a84 100644 --- a/src/java/README.md +++ b/src/java/README.md @@ -7,7 +7,7 @@ Develop Java applications. Includes the JDK and Java extensions. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-bullseye | +| imageVariant | Java version (use -trixie, or -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-trixie | | installMaven | Install Maven, a management tool for Java | boolean | false | | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false | diff --git a/src/java/devcontainer-template.json b/src/java/devcontainer-template.json index 4dc3c394..941e240b 100644 --- a/src/java/devcontainer-template.json +++ b/src/java/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "4.0.2", + "version": "5.0.0", "name": "Java", "description": "Develop Java applications. Includes the JDK and Java extensions.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java", @@ -11,6 +11,9 @@ "type": "string", "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "21-trixie", + "17-trixie", + "11-trixie", "21-bookworm", "17-bookworm", "11-bookworm", @@ -20,7 +23,7 @@ "11-bullseye", "8-bullseye" ], - "default": "21-bullseye" + "default": "21-trixie" }, "installMaven": { "type": "boolean", From 6aad2795607c67fac69f556a349dff5112a1c734 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Mon, 29 Sep 2025 08:16:43 +0000 Subject: [PATCH 2/2] removing bullseye --- src/java-postgres/README.md | 2 +- src/java-postgres/devcontainer-template.json | 6 +----- src/java/README.md | 2 +- src/java/devcontainer-template.json | 8 ++------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/java-postgres/README.md b/src/java-postgres/README.md index cb493ea5..675ccab4 100644 --- a/src/java-postgres/README.md +++ b/src/java-postgres/README.md @@ -7,7 +7,7 @@ Develop applications with Java and PostgreSQL. Includes a Java application conta | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Java version (use -trixie, or -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-trixie | +| imageVariant | Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon): | string | 21-trixie | | installMaven | Install Maven, a management tool for Java | boolean | false | | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false | diff --git a/src/java-postgres/devcontainer-template.json b/src/java-postgres/devcontainer-template.json index 68fb079b..57d2030b 100644 --- a/src/java-postgres/devcontainer-template.json +++ b/src/java-postgres/devcontainer-template.json @@ -17,11 +17,7 @@ "21-bookworm", "17-bookworm", "11-bookworm", - "8-bookworm", - "21-bullseye", - "17-bullseye", - "11-bullseye", - "8-bullseye" + "8-bookworm" ], "default": "21-trixie" }, diff --git a/src/java/README.md b/src/java/README.md index cd359a84..040f9598 100644 --- a/src/java/README.md +++ b/src/java/README.md @@ -7,7 +7,7 @@ Develop Java applications. Includes the JDK and Java extensions. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Java version (use -trixie, or -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-trixie | +| imageVariant | Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon): | string | 21-trixie | | installMaven | Install Maven, a management tool for Java | boolean | false | | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false | diff --git a/src/java/devcontainer-template.json b/src/java/devcontainer-template.json index 941e240b..3a5e9c25 100644 --- a/src/java/devcontainer-template.json +++ b/src/java/devcontainer-template.json @@ -9,7 +9,7 @@ "options": { "imageVariant": { "type": "string", - "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):", + "description": "Java version (use -trixie, or -bookworm, variants on local arm64/Apple Silicon):", "proposals": [ "21-trixie", "17-trixie", @@ -17,11 +17,7 @@ "21-bookworm", "17-bookworm", "11-bookworm", - "8-bookworm", - "21-bullseye", - "17-bullseye", - "11-bullseye", - "8-bullseye" + "8-bookworm" ], "default": "21-trixie" },