From ae282fe0878eca3c48271b4f937a54534529202d Mon Sep 17 00:00:00 2001
From: George Lungley <54810125+glungley@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:52:50 +0100
Subject: [PATCH] chore: get devcontainer to pass trivy linting (#721)

---
 .cspell.json             | 8 +++++++-
 .devcontainer/Dockerfile | 7 +++++--
 .trivyignore             | 2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .trivyignore

diff --git a/.cspell.json b/.cspell.json
index eefd53e5..df9a27fe 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -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"],
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 67be60be..eae4de4d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -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
diff --git a/.trivyignore b/.trivyignore
new file mode 100644
index 00000000..f77baada
--- /dev/null
+++ b/.trivyignore
@@ -0,0 +1,2 @@
+# Healthcheck isn't necessary in a devcontainer
+AVD-DS-0026