Update ESP image

Author: rapgenic

barearm/.devcontainer/Dockerfile

@@ -63,7 +63,7 @@ RUN ln -s /opt/stm32cubeprogrammer/bin/STM32_Programmer_CLI /usr/local/bin/STM32
 # PyOCD
 RUN pip install --break-system-packages pyocd==0.36.0
 
-# clangd (version 17.0.3)
+# clangd (version 20.1.0)
 RUN mkdir /tmp/clangd && \
 	curl -sL -o /tmp/clangd/clangd.zip "https://github.com/clangd/clangd/releases/download/20.1.0/clangd-linux-20.1.0.zip" && \
 	unzip /tmp/clangd/clangd.zip -d /tmp/clangd && \

barearm/.devcontainer/devcontainer.json

@@ -4,9 +4,7 @@
 		"context": "../"
 	},
 	"privileged": true,
-	"mounts": [
-		"type=bind,source=/dev,target=/dev"
-	],
+	"mounts": ["type=bind,source=/dev,target=/dev"],
 	"remoteUser": "vscode",
 	"customizations": {
 		"vscode": {
@@ -55,4 +53,4 @@
 			]
 		}
 	}
-}
+}

esp/.devcontainer/Dockerfile

@@ -1,22 +1,15 @@
-FROM espressif/idf:v5.0.2
+FROM espressif/idf:v5.4.2
 
-# clangd (version 16.0.2)
+ENV IDF_GIT_SAFE_DIR="*"
+
+# clangd (version 20.1.0)
 RUN mkdir /tmp/clangd && \
-	curl -sL -o /tmp/clangd/clangd.zip "https://github.com/clangd/clangd/releases/download/16.0.2/clangd-linux-16.0.2.zip" && \
+	curl -sL -o /tmp/clangd/clangd.zip "https://github.com/clangd/clangd/releases/download/20.1.0/clangd-linux-20.1.0.zip" && \
 	unzip /tmp/clangd/clangd.zip -d /tmp/clangd && \
-	cp -r /tmp/clangd/clangd_16.0.2/* /usr/local/
-
-# Add non-root user
-RUN useradd -s /bin/bash -m vscode
-
-# Clangd default configuration
-COPY --chown=vscode:vscode config.yaml /home/vscode/.config/clangd/config.yaml
+	cp -r /tmp/clangd/clangd_20.1.0/* /usr/local/ && \
+	rm -rf /tmp/clangd
 
 COPY 02-esp.sh /etc/profile.d/
 
-USER vscode
-
-# Trust ESP git folders
-RUN git config --global --add safe.directory "*"
-
-USER root
+# Clangd default configuration
+COPY --chown=ubuntu:ubuntu config.yaml /home/ubuntu/.config/clangd/config.yaml

esp/.devcontainer/devcontainer.json

@@ -4,32 +4,46 @@
 		"context": "../"
 	},
 	"privileged": true,
-	"mounts": [
-		"type=bind,source=/dev,target=/dev"
-	],
-	"remoteUser": "vscode",
+	"mounts": ["type=bind,source=/dev,target=/dev"],
+	"remoteUser": "ubuntu",
 	"features": {
 		"ghcr.io/devcontainers/features/common-utils:2": {
-			"installZsh": "true",
-			"username": "vscode",
-			"userUid": "1000",
-			"userGid": "1000",
 			"upgradePackages": "true"
 		}
 	},
 	"customizations": {
 		"vscode": {
 			"settings": {
 				"remote.autoForwardPorts": false,
-				"cmake.generator": "Ninja",
 				// Disable microsoft c/c++ intellisense
 				"C_Cpp.intelliSenseEngine": "disabled",
 				// Default clangd arguments
 				"clangd.arguments": [
 					"--function-arg-placeholders=false",
 					"--query-driver=**",
 					"--header-insertion=never"
-				]
+				],
+				"editor.semanticTokenColorCustomizations": {
+					"[Default Dark+]": {
+						"rules": {
+							"comment:cpp": "#707070",
+							"comment:c": "#707070"
+						}
+					},
+					"[Default Dark Modern]": {
+						"rules": {
+							"comment:cpp": "#707070",
+							"comment:c": "#707070"
+						}
+					}
+				},
+				"terminal.integrated.env.linux": {
+					"EDITOR": "code --wait"
+				},
+				"git.autoStash": true,
+				"files.associations": {
+					".clangd": "yaml"
+				}
 			},
 			"extensions": [
 				"mhutchie.git-graph",
@@ -46,4 +60,4 @@
 			]
 		}
 	}
-}
+}

esp/02-esp.sh

@@ -1 +1 @@
-. $IDF_PATH/export.sh
+. /opt/esp/entrypoint.sh

esp/config.yaml

@@ -2,4 +2,7 @@ CompileFlags:
   Add:
     - -D__CLANGD__
   Remove:
-    - -fno-isolate-erroneous-paths-dereference
+    - -fno-isolate-erroneous-paths-dereference
+Diagnostics:
+  UnusedIncludes: None
+  MissingIncludes: None