build: use latest devcontainer (#275)

* build: use latest devcontainer

* chore: process review comments

* chore: re-format launch.json

.devcontainer/Dockerfile

@@ -1 +1,3 @@
-FROM ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e
+FROM ghcr.io/philips-software/amp-devcontainer-vscode:v4.5.0@sha256:b723eb2a51ac02b72ede404b7e6557096472966dfee2d5258eee0071a1262cb3
+
+HEALTHCHECK NONE

.devcontainer/devcontainer.json

@@ -1,37 +1,6 @@
 {
-  // This devcontainer has been set-up to run docker-from-docker scenarios as per
-  // https://github.com/microsoft/vscode-dev-containers/tree/main/containers/docker-from-docker
   "build": {
     "context": "..",
     "dockerfile": "Dockerfile"
-  },
-  "runArgs": ["--add-host=host.docker.internal:host-gateway"],
-  "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
-  "mounts": [
-    "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
-  ],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "llvm-vs-code-extensions.vscode-clangd",
-        "marus25.cortex-debug",
-        "matepek.vscode-catch2-test-adapter",
-        "mhutchie.git-graph",
-        "ms-vscode.cmake-tools",
-        "ms-vscode.cpptools",
-        "ms-vsliveshare.vsliveshare",
-        "SonarSource.sonarlint-vscode"
-      ],
-      "settings": {
-        "C_Cpp.autoAddFileAssociations": false,
-        "C_Cpp.intelliSenseEngine": "disabled",
-        "clangd.arguments": [
-          "--query-driver=/**/arm-none-eabi-*"
-        ],
-        "cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json",
-        "cmake.options.statusBarVisibility": "compact",
-        "sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json"
-      }
-    }
   }
 }

.trivyignore

@@ -1,7 +1,3 @@
 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/
 # We allow root access in our container that we use for development purposes
 DS002
-
-# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/
-# We don't require a HEALTHCHECK for our devcontainer
-DS026

.vscode/launch.json

@@ -1,72 +1,71 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "stm32f767",
-            "cwd": "${workspaceFolder}",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "device": "STM32F767ZI",
-            "servertype": "external",
-            "showDevDebugOutput": "both",
-            "gdbTarget": "host.docker.internal:2331",
-            "overrideLaunchCommands": [
-                "monitor reset",
-                "-target-download",
-                "monitor reset"
-            ],
-            "overrideRestartCommands": [ "monitor reset" ]
-        },
-        {
-            "name": "stm32f767 without container",
-            "cwd": "${workspaceRoot}",
-            "request": "launch",
-            "executable": "${command:cmake.launchTargetPath}",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F767ZI"
-        },
-        {
-            "name": "stm32g431 without container",
-            "cwd": "${workspaceRoot}",
-            "request": "launch",
-            "executable": "${command:cmake.launchTargetPath}",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32G431RB"
-        },
-        {
-            "name": "stm32g070 without container",
-            "cwd": "${workspaceRoot}",
-            "request": "launch",
-            "executable": "${command:cmake.launchTargetPath}",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32G070RB"
-        },
-        {
-            "name": "stm32wb55rg",
-            "cwd": "${workspaceFolder}",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "device": "STM32WB55RG",
-            "servertype": "external",
-            "runToEntryPoint": "main",
-            "showDevDebugOutput": "both",
-            "gdbTarget": "host.docker.internal:61234",
-            "overrideLaunchCommands": [
-                "monitor reset",
-                "-target-download",
-                "monitor reset"
-            ],
-            "overrideRestartCommands": [
-                "monitor reset"
-            ]
-        }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "stm32f767",
+      "cwd": "${workspaceFolder}",
+      "executable": "${command:cmake.launchTargetPath}",
+      "request": "launch",
+      "type": "cortex-debug",
+      "device": "STM32F767ZI",
+      "svdPath": "Keil::STM32F7xx_DFP@2.15.2",
+      "deviceName": "STM32F767ZITx",
+      "servertype": "external",
+      "showDevDebugOutput": "both",
+      "gdbTarget": "host.docker.internal:2331",
+      "overrideLaunchCommands": [
+        "monitor reset",
+        "-target-download",
+        "monitor reset"
+      ],
+      "overrideRestartCommands": ["monitor reset"]
+    },
+    {
+      "name": "stm32f767 without container",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "executable": "${command:cmake.launchTargetPath}",
+      "type": "cortex-debug",
+      "servertype": "jlink",
+      "device": "STM32F767ZI",
+      "svdPath": "Keil::STM32F7xx_DFP@2.15.2",
+      "deviceName": "STM32F767ZITx"
+    },
+    {
+      "name": "stm32g431 without container",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "executable": "${command:cmake.launchTargetPath}",
+      "type": "cortex-debug",
+      "servertype": "jlink",
+      "device": "STM32G431RB"
+    },
+    {
+      "name": "stm32g070 without container",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "executable": "${command:cmake.launchTargetPath}",
+      "type": "cortex-debug",
+      "servertype": "jlink",
+      "device": "STM32G070RB"
+    },
+    {
+      "name": "stm32wb55rg",
+      "cwd": "${workspaceFolder}",
+      "executable": "${command:cmake.launchTargetPath}",
+      "request": "launch",
+      "type": "cortex-debug",
+      "device": "STM32WB55RG",
+      "servertype": "external",
+      "runToEntryPoint": "main",
+      "showDevDebugOutput": "both",
+      "gdbTarget": "host.docker.internal:61234",
+      "overrideLaunchCommands": [
+        "monitor reset",
+        "-target-download",
+        "monitor reset"
+      ],
+      "overrideRestartCommands": ["monitor reset"]
+    }
+  ]
 }