Skip to content

Commit

Permalink
chore: update amp-devcontainer from v2.5.0 to v4.0.2 (#217)
Browse files Browse the repository at this point in the history
chore: update amp-devcontainer to v4.0.2
  • Loading branch information
rjaegers authored Dec 6, 2023
1 parent e50cf39 commit 50dfd87
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 31 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e
56 changes: 34 additions & 22 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.6/containers/cpp
{
"name": "C++",
"image": "ghcr.io/philips-software/amp-devcontainer@sha256:a6e3e72d23ad998339495c2c4e921155cda3bdd3554f1350b55fe7501a1136e9", //v2.5.0
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],
// Add the IDs of extensions you want installed when the container is created.
"customizations": {
"vscode": {
"settings": {},
"extensions": [
"marus25.cortex-debug",
"mcu-debug.debug-tracker-vscode",
"matepek.vscode-catch2-test-adapter",
"ms-vscode.cmake-tools",
"llvm-vs-code-extensions.vscode-clangd",
"SonarSource.sonarlint-vscode"
]
}
// 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"
}
}
}
}
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ updates:
directory: /
schedule:
interval: daily
- package-ecosystem: docker
directory: /
schedule:
interval: daily
2 changes: 1 addition & 1 deletion .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ ENABLE:
- YAML
DISABLE_LINTERS:
- REPOSITORY_DEVSKIM
- REPOSITORY_KICS
- REPOSITORY_SEMGREP
- SPELL_CSPELL
- SPELL_PROSELINT
DISABLE_ERRORS_LINTERS:
- MARKDOWN_MARKDOWN_LINK_CHECK
- SPELL_LYCHEE
PRINT_ALPACA: false
FLAVOR_SUGGESTIONS: false
SHOW_SKIPPED_LINTERS: false
FILTER_REGEX_EXCLUDE: (hal_st/middlewares/STM32_WPAN/)
7 changes: 7 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 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
8 changes: 0 additions & 8 deletions .vscode/extensions.json

This file was deleted.

0 comments on commit 50dfd87

Please sign in to comment.