Re-pin images with new major versions (Dotnet) (#213)

* Re-pin images with new major versions (Dotnet) * mongodb does not have support for debian 12 * adds "bookworm" options
devcontainers · Oct 27, 2023 · 45e9f2c · 45e9f2c
1 parent 45d04cc
commit 45e9f2c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/src/dotnet-fsharp/.devcontainer/devcontainer.json b/src/dotnet-fsharp/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "F# (.NET)",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/dotnet:0-6.0-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0-bullseye",
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

diff --git a/src/dotnet-fsharp/devcontainer-template.json b/src/dotnet-fsharp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet-fsharp",
-    "version": "1.1.2",
+    "version": "2.0.0",
     "name": "F# (.NET)",
     "description": "Develop F# and .NET based applications. Includes all needed SDKs, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-fsharp",

diff --git a/src/dotnet-mssql/.devcontainer/Dockerfile b/src/dotnet-mssql/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/dotnet:0-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/dotnet:1-${templateOption:imageVariant}
 
 # Install SQL Tools: SQLPackage and sqlcmd
 COPY mssql/installSQLtools.sh installSQLtools.sh

diff --git a/src/dotnet-mssql/devcontainer-template.json b/src/dotnet-mssql/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet-mssql",
-    "version": "1.2.6",
+    "version": "2.0.0",
     "name": "C# (.NET) and MS SQL",
     "description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and an MS SQL container for parallel database development. Adds an additional MS SQL container to the C# (.NET Core) container definition and deploys any .dacpac files from the mssql .devcontainer folder.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-mssql",
@@ -13,13 +13,15 @@
             "proposals": [
                 "7.0",
                 "6.0",
+                "7.0-bookworm",
+                "6.0-bookworm",
                 "7.0-bullseye",
                 "6.0-bullseye",
                 "7.0-jammy",
                 "6.0-jammy",
                 "6.0-focal"
             ],
-            "default": "7.0"
+            "default": "7.0-bullseye"
         }
     },
     "platforms": [

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

diff --git a/src/dotnet-postgres/devcontainer-template.json b/src/dotnet-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet-postgres",
-    "version": "1.3.2",
+    "version": "2.0.0",
     "name": "C# (.NET) and PostgreSQL",
     "description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and a PostgreSQL container for parallel database development. Adds an additional PostgreSQL container to the C# (.NET Core) container definition.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-postgres",
@@ -13,13 +13,15 @@
             "proposals": [
                 "7.0",
                 "6.0",
+                "7.0-bookworm",
+                "6.0-bookworm",
                 "7.0-bullseye",
                 "6.0-bullseye",
                 "7.0-jammy",
                 "6.0-jammy",
                 "6.0-focal"
             ],
-            "default": "7.0"
+            "default": "7.0-bullseye"
         }
     },
     "platforms": [

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

diff --git a/src/dotnet/devcontainer-template.json b/src/dotnet/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.2.5",
+    "version": "2.0.0",
     "name": "C# (.NET)",
     "description": "Develop C# and .NET based applications. Includes all needed SDKs, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet",
@@ -13,13 +13,15 @@
             "proposals": [
                 "7.0",
                 "6.0",
+                "7.0-bookworm",
+                "6.0-bookworm",
                 "7.0-bullseye",
                 "6.0-bullseye",
                 "7.0-jammy",
                 "6.0-jammy",
                 "6.0-focal"
             ],
-            "default": "7.0"
+            "default": "7.0-bullseye"
         }
     },
     "platforms": [

diff --git a/src/javascript-node-mongo/.devcontainer/Dockerfile b/src/javascript-node-mongo/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}
 
 # Install MongoDB command line tools - though mongo-database-tools not available on arm64
 ARG MONGO_TOOLS_VERSION=6.0

diff --git a/src/javascript-node-mongo/devcontainer-template.json b/src/javascript-node-mongo/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-mongo",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "name": "Node.js & Mongo DB",
     "description": "Develop applications in Node.js and Mongo DB. Includes Node.js, eslint, and yarn in a container linked to a Mongo DB.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-mongo",
@@ -11,14 +11,12 @@
             "type": "string",
             "description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
-				"20",
-                "18",
 				"20-bullseye",
                 "18-bullseye",
 				"20-buster",
                 "18-buster"
             ],
-            "default": "20"
+            "default": "20-bullseye"
         }
     },
     "platforms": [