Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/java-postgres/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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=""
Expand Down
2 changes: 1 addition & 1 deletion src/java-postgres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 |

Expand Down
13 changes: 6 additions & 7 deletions src/java-postgres/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -11,16 +11,15 @@
"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",
"8-bookworm",
"21-bullseye",
"17-bullseye",
"11-bullseye",
"8-bullseye"
"8-bookworm"
],
"default": "21-bullseye"
"default": "21-trixie"
},
"installMaven": {
"type": "boolean",
Expand Down
2 changes: 1 addition & 1 deletion src/java/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 |

Expand Down
15 changes: 7 additions & 8 deletions src/java/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -9,18 +9,17 @@
"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",
"11-trixie",
"21-bookworm",
"17-bookworm",
"11-bookworm",
"8-bookworm",
"21-bullseye",
"17-bullseye",
"11-bullseye",
"8-bullseye"
"8-bookworm"
],
"default": "21-bullseye"
"default": "21-trixie"
},
"installMaven": {
"type": "boolean",
Expand Down
Loading