PHP Templates: Add debian:bookworm options & remove the ones without …

…OS bit (#182)
devcontainers · Jul 25, 2023 · f086088 · f086088
1 parent 0ffbdc1
commit f086088
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/src/go-postgres/.devcontainer/Dockerfile b/src/go-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/go:0-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json
@@ -1,30 +1,27 @@
 {
  "id": "go-postgres",
- "version": "1.2.2",
+ "version": "2.0.0",
  "name": "Go & PostgreSQL",
  "description": "Use and develop Go + Postgres applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
  "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go-postgres",
  "publisher": "Dev Container Spec Maintainers",
  "licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
  "options": {
- "imageVariant": {
+ "imageVariant": {
  "type": "string",
- "description": "Go version (use -bullseye variants on local arm64/Apple Silicon):",
+ "description": "Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
  "proposals": [
- "1",
- "1.20",
- "1.19",
- "1.18",
+ "1-bookworm",
+ "1.20-bookworm",
+ "1.19-bookworm",
  "1-bullseye",
  "1.20-bullseye",
  "1.19-bullseye",
- "1.18-bullseye",
  "1-buster",
  "1.20-buster",
- "1.19-buster",
- "1.18-buster"
+ "1.19-buster"
  ],
- "default": "1-bullseye"
+ "default": "1.20-bullseye"
  }
  },
  "platforms": [

diff --git a/src/go/.devcontainer/devcontainer.json b/src/go/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
  "name": "Go",
  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
- "image": "mcr.microsoft.com/devcontainers/go:0-${templateOption:imageVariant}"
+ "image": "mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}"
 
  // Features to add to the dev container. More info: https://containers.dev/features.
  // "features": {},

diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json
@@ -1,30 +1,27 @@
 {
  "id": "go",
- "version": "1.2.1",
+ "version": "2.0.0",
  "name": "Go",
  "description": "Develop Go based applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
  "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go",
  "publisher": "Dev Container Spec Maintainers",
  "licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
  "options": {
- "imageVariant": {
+ "imageVariant": {
  "type": "string",
- "description": "Go version (use -bullseye variants on local arm64/Apple Silicon):",
+ "description": "Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
  "proposals": [
- "1",
- "1.20",
- "1.19",
- "1.18",
+ "1-bookworm",
+ "1.20-bookworm",
+ "1.19-bookworm",
  "1-bullseye",
  "1.20-bullseye",
  "1.19-bullseye",
- "1.18-bullseye",
  "1-buster",
  "1.20-buster",
- "1.19-buster",
- "1.18-buster"
+ "1.19-buster"
  ],
- "default": "1-bullseye"
+ "default": "1.20-bullseye"
  }
  },
  "platforms": [