From 5eeb125d747ee979d4a21fbdac68a57887ae92ae Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Sat, 7 Oct 2023 01:16:55 +0200
Subject: [PATCH] Dev container

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/devcontainer.json | 42 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cefa48f..f80e70b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -11,7 +11,7 @@ RUN chown vscode: -R /usr/local/rustup /usr/local/cargo
 
 USER vscode
 
-RUN rustup default 1.57.0 \
+RUN rustup default 1.73.0 \
  && rustup component add clippy rust-src rustfmt
 
 RUN cargo install cargo-outdated cargo-cache cargo-criterion \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2ec4fb2..b05627e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,26 +8,30 @@
 		"--security-opt",
 		"seccomp=unconfined"
 	],
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
-		"lldb.executable": "/usr/bin/lldb",
-		// VS Code don't watch files under ./target
-		"files.watcherExclude": {
-			"**/target/**": true
-		}
-	},
+
 	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"bungcip.better-toml",
-		"vadimcn.vscode-lldb",
-		"serayuzgur.crates",
-		"editorconfig.editorconfig",
-		"swellaby.vscode-rust-test-adapter",
-		"matklad.rust-analyzer",
-		"asciidoctor.asciidoctor-vscode",
-		"ms-vscode.test-adapter-converter"
-	],
+    // Set *default* container specific settings.json values on container create.
+    "customizations": {
+        "vscode": {
+            "terminal.integrated.shell.linux": "/bin/bash",
+            "lldb.executable": "/usr/bin/lldb",
+            // VS Code don't watch files under ./target
+            "files.watcherExclude": {
+                "**/target/**": true
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "bungcip.better-toml",
+                "vadimcn.vscode-lldb",
+                "serayuzgur.crates",
+                "editorconfig.editorconfig",
+                "swellaby.vscode-rust-test-adapter",
+                "matklad.rust-analyzer",
+                "asciidoctor.asciidoctor-vscode",
+                "ms-vscode.test-adapter-converter"
+            ]
+        }
+    },
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 	// Use 'postCreateCommand' to run commands after the container is created.