Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/yaml-2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
npalm authored Oct 18, 2024
2 parents 12b0754 + ae282fe commit 1c3edd4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
"report",
".*"
],
"ignoreWords": ["niek", "npalm", "nvmrc", "markdownlintignore"],
"ignoreWords": [
"niek",
"npalm",
"nvmrc",
"markdownlintignore",
"devcontainer"
],
"language": "en",
"noConfigSearch": true,
"words": ["linebreak", "megalinter", "oxsecurity", "REAMDE"],
Expand Down
7 changes: 5 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ARG VARIANT="20-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:1-${VARIANT}

RUN apt-get update && apt-get install bash-completion gnupg2 --no-install-recommends -y
# hadolint ignore=DL3008
RUN apt-get update && apt-get install bash-completion gnupg2 --no-install-recommends -y && rm -rf /var/lib/apt/lists/*

USER node
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Healthcheck isn't necessary in a devcontainer
AVD-DS-0026

0 comments on commit 1c3edd4

Please sign in to comment.